Enables building compressed Windows test builds with --pack option.

diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat
index 5ae512fbbe4b2f5b11209f7b17d4b06c82955ee3..716934ae7038f8133b9a70fd9ba02b3e9b355e52 100644 (file)
--- a/Tools/msi/build.bat
+++ b/Tools/msi/build.bat
@@ -7,6 +7,7 @@ set BUILDX86=
 set BUILDX64=\r
 set BUILDDOC=\r
 set BUILDPX=\r
+set BUILDPACK=\r
 \r
 :CheckOpts\r
 if "%~1" EQU "-h" goto Help\r
@@ -14,6 +15,7 @@ if "%~1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
 if "%~1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts\r
 if "%~1" EQU "--doc" (set BUILDDOC=1) && shift && goto CheckOpts\r
 if "%~1" EQU "--test-marker" (set BUILDPX=1) && shift && goto CheckOpts\r
+if "%~1" EQU "--pack" (set BUILDPACK=1) && shift && goto CheckOpts\r
 \r
 if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)\r
 \r
@@ -41,6 +43,9 @@ set BUILD_CMD="%D%bundle\snapshot.wixproj"
 if defined BUILDPX (\r
     set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true\r
 )\r
+if defined BUILDPACK (\r
+    set BUILD_CMD=%BUILD_CMD% /p:Pack=true\r
+)\r
 \r
 if defined BUILDX86 (\r
     "%PCBUILD%win32\python.exe" "%D%get_wix.py"\r
@@ -56,9 +61,10 @@ if defined BUILDX64 (
 exit /B 0\r
 \r
 :Help\r
-echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker]\r
+echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker] [--pack]\r
 echo.\r
 echo    -x86                Build x86 installers\r
 echo    -x64                Build x64 installers\r
 echo    --doc               Build CHM documentation\r
 echo    --test-marker       Build installers with 'x' markers\r
+echo    --pack              Embed core MSIs into installer\r

diff --git a/Tools/msi/bundle/snapshot.wixproj b/Tools/msi/bundle/snapshot.wixproj
index 8fe95a8d6923c855fe312b8e1ba886e4a4722fe7..cc450432990635e80c1ad279050a03e74e394199 100644 (file)
--- a/Tools/msi/bundle/snapshot.wixproj
+++ b/Tools/msi/bundle/snapshot.wixproj
@@ -9,9 +9,14 @@
     <Import Project="..\msi.props" />
 
     <PropertyGroup>
+        <DefineConstants Condition="'$(Pack)' != 'true'">
+            $(DefineConstants);CompressMSI=no;
+        </DefineConstants>
+        <DefineConstants Condition="'$(Pack)' == 'true'">
+            $(DefineConstants);CompressMSI=yes;
+        </DefineConstants>
         <DefineConstants>
             $(DefineConstants);
-            CompressMSI=no;
             CompressPDB=no;
             CompressMSI_D=no;
         </DefineConstants>