Side by Side Diff: installer/msibuild.cmd
Issue 5752158993514496:
Issue 1578 - Add notransforms installer for installations using Group Policy Object (Closed)
Patch Set:
Created Dec. 11, 2014, 3:01 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« installer/installer.gyp ('K')
|
« installer/installer.gyp ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
no next file with comments »
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 | 7 set LOCALE_NAME=%1 |
| 8 shift | 8 shift |
| 9 set LOCALE_FILE=%1 | 9 set LOCALE_FILE=%1 |
| 10 shift | 10 shift |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 set WIXOBJ=%WIXOBJ% %1 | 25 set WIXOBJ=%WIXOBJ% %1 |
| 26 if "%WIXOBJ%"=="" goto Help | 26 if "%WIXOBJ%"=="" goto Help |
| 27 if "%FLAG%"=="initial" ( | 27 if "%FLAG%"=="initial" ( |
| 28 set CULTURES= | 28 set CULTURES= |
| 29 goto Light | 29 goto Light |
| 30 ) | 30 ) |
| 31 if "%FLAG%"=="additional" ( | 31 if "%FLAG%"=="additional" ( |
| 32 set CULTURES=-cultures:%LOCALE_NAME% | 32 set CULTURES=-cultures:%LOCALE_NAME% |
| 33 goto Light | 33 goto Light |
| 34 ) | 34 ) |
| 35 if "%FLAG%"=="notransforms" ( | |
| 36 set CULTURES= | |
| 37 goto Light | |
| 38 ) | |
| 35 echo First argument must be either 'initial' or 'additional' | 39 echo First argument must be either 'initial' or 'additional' |
| 36 exit /b 1 | 40 exit /b 1 |
| 37 goto End | 41 goto End |
| 38 :Light | 42 :Light |
| 39 echo on | 43 echo on |
| 40 light -notidy -nologo -ext WixUIExtension -sval %CULTURES% -loc %LOCALE_FILE% -o ut %MSI_LOCALE% %WIXOBJ% | 44 light -notidy -nologo -ext WixUIExtension -sval %CULTURES% -loc %LOCALE_FILE% -o ut %MSI_LOCALE% %WIXOBJ% |
| 41 if errorlevel 1 GOTO :Error | 45 if errorlevel 1 GOTO :Error |
| 42 @echo off | 46 @echo off |
| 43 if "%FLAG%"=="additional" goto Additional | 47 if "%FLAG%"=="additional" goto Additional |
| 48 if "%FLAG%"=="notransforms" goto End | |
| 44 :Initial | 49 :Initial |
| 45 echo on | 50 echo on |
| 46 copy %MSI_LOCALE% %MSI_INTERIM% | 51 copy %MSI_LOCALE% %MSI_INTERIM% |
| 47 copy %MSI_LOCALE% %MSI_BASE% | 52 copy %MSI_LOCALE% %MSI_BASE% |
| 48 @echo off | 53 @echo off |
| 49 goto End | 54 goto End |
| 50 :Additional | 55 :Additional |
| 51 echo on | 56 echo on |
| 52 msitran -g %MSI_BASE% %MSI_LOCALE% %MST% | 57 msitran -g %MSI_BASE% %MSI_LOCALE% %MST% |
| 53 if errorlevel 1 GOTO :Error | 58 if errorlevel 1 GOTO :Error |
| (...skipping 26 matching lines...) Expand all Loading... | |
| 80 echo Additional build | 85 echo Additional build |
| 81 echo - Create ^<msi_locale^> | 86 echo - Create ^<msi_locale^> |
| 82 echo - Generate ^<mst^> by comparing ^<msi_locale^> against ^<msi_base^> | 87 echo - Generate ^<mst^> by comparing ^<msi_locale^> against ^<msi_base^> |
| 83 echo - Embed ^<mst^> into ^<msi_interim^> with storage identifier ^<locale_id^ > | 88 echo - Embed ^<mst^> into ^<msi_interim^> with storage identifier ^<locale_id^ > |
| 84 echo. | 89 echo. |
| 85 | 90 |
| 86 :Error | 91 :Error |
| 87 exit /b 1 | 92 exit /b 1 |
| 88 | 93 |
| 89 :End | 94 :End |
| OLD | NEW |
« installer/installer.gyp ('K')
|
« installer/installer.gyp ('k')
|
installer/src/msi/adblockplusie.wxs » ('j')
|
no next file with comments »
