Changeset 360

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

added ja-jp as a buildable target. renamed all the config/string files. no need to pass INTL to NSIS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r359 r360  
    1212# Windows can build installers and MARs for all languages with `make win` 
    1313 
    14 INTL := $(filter de-de en-US es-us fr-fr it-it ko-kr pt-br zh-hk, $(MAKECMDGOALS)) 
     14INTL := $(filter de-de en-US es-us fr-fr it-it ko-kr pt-br zh-hk ja-jp, $(MAKECMDGOALS)) 
    1515ifeq (de-de, $(INTL)) 
    1616INTL_SHORT := de 
    …… 
    4444INTL_SHORT := hk 
    4545INTL_WIN := TradChinese 
     46endif 
     47ifeq (ja-jp, $(INTL)) 
     48INTL_SHORT := ja 
     49INTL_WIN := Japanese 
    4650endif 
    4751 
    …… 
    347351 
    348352        perl -e 'print chr(255).chr(254)' > \ 
    349                 $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     353                $(BUILD)/build.nsi 
    350354        perl -pe 's/(.)/$$1\0/sg' win_installer/build.nsi >> \ 
    351                 $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
    352  
    353         cp win_installer/strings-$(INTL_WIN).nsh $(BUILD)/strings-$(INTL_WIN).nsh 
    354         cp win_installer/config-$(INTL_WIN).ini $(BUILD)/config-$(INTL_WIN).ini 
     355                $(BUILD)/build.nsi 
     356 
     357        cp win_installer/strings-$(INTL).nsh $(BUILD)/strings.nsh 
     358        cp win_installer/config-$(INTL).ini $(BUILD)/config.ini 
    355359 
    356360        $(MAKE_NSIS) -DVERSION=$(VER) \ 
    357361                -DVERSION_DATE=$(VER_DATE) \ 
    358362                -DLANG_NAME=$(INTL_WIN) \ 
    359                 $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
     363                $(BUILD)/build.nsi 
    360364 
    361365        mv $(BUILD)/FlickrUploadr-$(VER)-XX.exe \ 
    362366                $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).exe 
    363367 
    364         rm $(BUILD)/windows_install_build-$(INTL_SHORT).nsi 
    365         rm $(BUILD)/strings-$(INTL_WIN).nsh 
    366         rm $(BUILD)/config-$(INTL_WIN).ini 
     368        rm $(BUILD)/build.nsi 
     369        rm $(BUILD)/strings.nsh 
     370        rm $(BUILD)/config.ini 
    367371endif 
    368372 

  • trunk/uploadr/win_installer/build.nsi

    r359 r360  
    1212; VERSION       #.#.#           (whatever, really) 
    1313; VERSION_DATE  YYYY.MM.DD.nn   (strictly now) 
    14 ; LANG_NAME     English         (bleh) 
     14; LANG_NAME     English         (???) 
    1515 
    1616!include "MUI.nsh" 
    …… 
    4242 
    4343!insertmacro MUI_LANGUAGE "${LANG_NAME}" 
    44 !include "strings-${LANG_NAME}.nsh" 
     44!include "strings.nsh" 
    4545 
    4646 
    …… 
    6767 
    6868 
    69 ReserveFile "config-${LANG_name}.ini" 
     69ReserveFile "config.ini" 
    7070!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS 
    7171 
    …… 
    131131Section "Start Menu Shortcuts" 
    132132        CreateShortCut "$SMPROGRAMS\Flickr Uploadr.lnk" "$INSTDIR\Flickr Uploadr.exe" "" "$INSTDIR\Flickr Uploadr.exe" 0 
    133         !insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "config-${LANG_name}.ini" "Field 1" "State" 
     133        !insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "config.ini" "Field 1" "State" 
    134134        StrCmp $INI_VALUE "1" "" +2     
    135135                CreateShortCut "$DESKTOP\Flickr Uploadr.lnk" "$INSTDIR\Flickr Uploadr.exe" "" "$INSTDIR\Flickr Uploadr.exe" 0 
    …… 
    137137 
    138138Function .onInit 
    139         !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config-${LANG_name}.ini" 
     139        !insertmacro MUI_INSTALLOPTIONS_EXTRACT "config.ini" 
    140140FunctionEnd 
    141141 
    142142Function CustomPageA 
    143143        !insertmacro MUI_HEADER_TEXT "$(integ_title)" "$(integ_text)" 
    144         !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config-${LANG_name}.ini" 
     144        !insertmacro MUI_INSTALLOPTIONS_DISPLAY "config.ini" 
    145145FunctionEnd 
    146146 
    …… 
    149149!insertmacro MUI_FUNCTION_DESCRIPTION_END 
    150150 
    151 UninstallIcon ".\MacUploadr.app\Contents\Resources\icons.ico" 
     151UninstallIcon "Flickr Uploadr\icons.ico" 
    152152 
    153153Section "Uninstall" 
    …… 
    164164SectionEnd 
    165165 
    166 Icon ".\MacUploadr.app\Contents\Resources\icons.ico" 
     166Icon "Flickr Uploadr\icons.ico"