Side by Side Diff: installer/msibuild.cmd
Issue 5989262990245888:
Use default localisations for WiX dialogs (Closed)
Patch Set:
Created April 29, 2014, 2:01 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« installer/installer.gyp ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
installer/src/msi/adblockplusie.wxs » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 @echo off | 1 @echo off |
| 2 setlocal | 2 setlocal |
| 3 set FLAG=%1 | 3 set FLAG=%1 |
| 4 shift | 4 shift |
| 5 set LOCALE_ID=%1 | 5 set LOCALE_ID=%1 |
| 6 shift | 6 shift |
| 7 set LOCALE_NAME=%1 | |
| 8 shift | |
| 7 set LOCALE_FILE=%1 | 9 set LOCALE_FILE=%1 |
| 8 shift | 10 shift |
| 9 set MSI_LOCALE=%1 | 11 set MSI_LOCALE=%1 |
| 10 shift | 12 shift |
| 11 set MST=%1 | 13 set MST=%1 |
| 12 shift | 14 shift |
| 13 set MSI_BASE=%1 | 15 set MSI_BASE=%1 |
| 14 shift | 16 shift |
| 15 set MSI_INTERIM=%1 | 17 set MSI_INTERIM=%1 |
| 16 shift | 18 shift |
| 17 set WIXOBJ=%1 | 19 set WIXOBJ=%1 |
| 18 shift | 20 shift |
| 19 set WIXOBJ=%WIXOBJ% %1 | 21 set WIXOBJ=%WIXOBJ% %1 |
| 20 shift | 22 shift |
| 21 set WIXOBJ=%WIXOBJ% %1 | 23 set WIXOBJ=%WIXOBJ% %1 |
| 22 shift | 24 shift |
| 23 set WIXOBJ=%WIXOBJ% %1 | 25 set WIXOBJ=%WIXOBJ% %1 |
| 24 if "%WIXOBJ%"=="" goto Help | 26 if "%WIXOBJ%"=="" goto Help |
| 25 if "%FLAG%"=="initial" goto Light | 27 if "%FLAG%"=="initial" ( |
| 26 if "%FLAG%"=="additional" goto Light | 28 set CULTURES= |
| 29 goto Light | |
| 30 ) | |
| 31 if "%FLAG%"=="additional" ( | |
| 32 set CULTURES=-cultures:%LOCALE_NAME% | |
| 33 goto Light | |
| 34 ) | |
| 27 echo First argument must be either 'initial' or 'additional' | 35 echo First argument must be either 'initial' or 'additional' |
| 28 exit /b 1 | 36 exit /b 1 |
| 29 goto End | 37 goto End |
| 30 :Light | 38 :Light |
| 31 echo on | 39 echo on |
| 32 light -notidy -nologo -ext WixUIExtension -sval -loc %LOCALE_FILE% -out %MSI_LOC ALE% %WIXOBJ% | 40 light -notidy -nologo -ext WixUIExtension -sval %CULTURES% -loc %LOCALE_FILE% -o ut %MSI_LOCALE% %WIXOBJ% |
| 33 if errorlevel 1 GOTO :Error | 41 if errorlevel 1 GOTO :Error |
| 34 @echo off | 42 @echo off |
| 35 if "%FLAG%"=="additional" goto Additional | 43 if "%FLAG%"=="additional" goto Additional |
| 36 :Initial | 44 :Initial |
| 37 echo on | 45 echo on |
| 38 copy %MSI_LOCALE% %MSI_INTERIM% | 46 copy %MSI_LOCALE% %MSI_INTERIM% |
| 39 copy %MSI_LOCALE% %MSI_BASE% | 47 copy %MSI_LOCALE% %MSI_BASE% |
| 40 @echo off | 48 @echo off |
| 41 goto End | 49 goto End |
| 42 :Additional | 50 :Additional |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 72 echo Additional build | 80 echo Additional build |
| 73 echo - Create ^<msi_locale^> | 81 echo - Create ^<msi_locale^> |
| 74 echo - Generate ^<mst^> by comparing ^<msi_locale^> against ^<msi_base^> | 82 echo - Generate ^<mst^> by comparing ^<msi_locale^> against ^<msi_base^> |
| 75 echo - Embed ^<mst^> into ^<msi_interim^> with storage identifier ^<locale_id^ > | 83 echo - Embed ^<mst^> into ^<msi_interim^> with storage identifier ^<locale_id^ > |
| 76 echo. | 84 echo. |
| 77 | 85 |
| 78 :Error | 86 :Error |
| 79 exit /b 1 | 87 exit /b 1 |
| 80 | 88 |
| 81 :End | 89 :End |
| OLD | NEW |
« no previous file with comments
|
« installer/installer.gyp ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
installer/src/msi/adblockplusie.wxs » ('J')
