Changeset 357

Show
Ignore:
Timestamp:
04/22/08 22:03:16 (2 years ago)
Author:
calh
Message:

further towards a working windows installer build - moving the NSIS files into one place trying to build only in the build tree

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r355 r357  
    7272APPNAME := Flickr\ Uploadr 
    7373 
    74 # Location to output finished DMGs 
     74# Location to output finished NSIS installers 
    7575OUT := /c/code/uploadr 
    7676 
     77# Location of the makensis.exe binary 
     78MAKE_NSIS := /c/Program\ Files/NSIS/Unicode/makensis.exe 
     79 
     80 
    7781# below here, don't modify anything 
    7882 
    7983# Dated version for the NSIS installer - this comes from application.ini 
    80 VER_DATE := `grep ^BuildID= $(SRC)/Resources/application.ini | sed 's/BuildID=\([0-9]\{4\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1.\2.\3.\4/'`; 
     84VER_DATE := `grep ^BuildID= $(SRC)/Resources/application.ini | sed 's/BuildID=\([0-9]\{4\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1.\2.\3.\4/'` 
    8185 
    8286# Location for build staging 
    …… 
    330334ifeq (win, $(PLATFORM)) 
    331335 
    332         @# TODO: This is broken in Windows because the *.nsi and *.nsh files 
    333         @# are stored as Windows Unicode, which is UTF-16 or UCS-2 
    334         sed 's/English/$(INTL_WIN)/g' windows_install_build.nsi > \ 
    335                 windows_install_build-$(INTL_SHORT).nsi 
    336  
    337         /c/Program\ Files/NSISUnicode/makensis.exe -DVERSION=$(VER) \ 
    338                 -DVERSION_DATE=$(VER_DATE) windows_install_build-$(INTL_SHORT).nsi 
    339         mv FlickrUploadr-$(VER)-XX.exe \ 
     336        # 
     337        # build the NSIS config file. convert it to UCS-2 
     338        # 
     339 
     340        sed 's/English/$(INTL_WIN)/g' win_installer/build.nsi > \ 
     341                $(BUILD)/windows_install.temp 
     342        perl -e 'print chr(255).chr(254)' > \ 
     343                $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     344 
     345        perl -pe 's/(.)/$$1\0/sg' $(BUILD)/windows_install.temp >> \ 
     346                $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     347        rm $(BUILD)/windows_install.temp 
     348 
     349        cp win_installer/strings-$(INTL_WIN).nsh $(BUILD)/strings-$(INTL_WIN).nsh 
     350 
     351        $(MAKE_NSIS) -DVERSION=$(VER) \ 
     352                -DVERSION_DATE=$(VER_DATE) $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     353 
     354        mv $(BUILD)/FlickrUploadr-$(VER)-XX.exe \ 
    340355                $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).exe 
    341 #       rm windows_install_build-$(INTL_SHORT).nsi 
     356 
     357        rm $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     358        rm $(BUILD)/strings-$(INTL_WIN).nsh 
    342359endif 
    343360 

  • trunk/uploadr/win_installer/build.nsi

    r356 r357  
    3838!macro LANG_LOAD LANGLOAD 
    3939        !insertmacro MUI_LANGUAGE "${LANGLOAD}" 
    40         !include "${LANGLOAD}.nsh" 
     40        !include "strings-${LANGLOAD}.nsh" 
    4141!macroend 
    4242!macro LANG_STRING NAME VALUE