Changeset 365

Show
Ignore:
Timestamp:
04/24/08 18:41:15 (2 years ago)
Author:
calh
Message:

build windows installer strings/config files from a single template, substituting strings from the locale folder. more ja-jp stuff in the makefile. convert files to utf-16 on the fly (only have utf-8 in trunk).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r361 r365  
    149149        make $(PLATFORM) pt-br build 
    150150        make $(PLATFORM) zh-hk build 
     151        make $(PLATFORM) ja-jp build 
    151152 
    152153all-mar: 
    …… 
    159160        @make $(PLATFORM) pt-br mar 
    160161        @make $(PLATFORM) zh-hk mar 
    161  
     162        @make $(PLATFORM) ja-jp mar 
    162163 
    163164 
    …… 
    178179zh-hk: 
    179180        @echo "Building Chinese (zh-hk)" 
     181ja-jp: 
     182        @echo "Building Japanese (ja-jp)" 
    180183 
    181184 
    …… 
    337340ifeq (win, $(PLATFORM)) 
    338341 
    339         perl -e 'print chr(255).chr(254)' > \ 
     342        perl win_installer/strsub.pl win_installer/strings.nsh \ 
     343                $(SRC)/Resources/chrome/locale/$(INTL)/installer.properties > \ 
     344                $(BUILD)/strings-temp.nsh 
     345        perl win_installer/utf16.pl \ 
     346                $(BUILD)/strings-temp.nsh > \ 
     347                $(BUILD)/strings.nsh 
     348        rm $(BUILD)/strings-temp.nsh 
     349 
     350        perl win_installer/strsub.pl win_installer/config.ini \ 
     351                $(SRC)/Resources/chrome/locale/$(INTL)/installer.properties > \ 
     352                $(BUILD)/config-temp.ini 
     353        perl win_installer/utf16.pl \ 
     354                $(BUILD)/config-temp.ini > \ 
     355                $(BUILD)/config.ini 
     356        rm $(BUILD)/config-temp.ini 
     357 
     358        perl win_installer/utf16.pl \ 
     359                win_installer/build.nsi > \ 
    340360                $(BUILD)/build.nsi 
    341         perl -pe 's/(.)/$$1\0/sg' win_installer/build.nsi >> \ 
    342                 $(BUILD)/build.nsi 
    343  
    344         cp win_installer/strings-$(INTL).nsh $(BUILD)/strings.nsh 
    345         cp win_installer/config-$(INTL).ini $(BUILD)/config.ini 
     361 
    346362        cp win_installer/vcredist_x86.exe $(BUILD)/vcredist_x86.exe 
    347363