commit 711dc147772b57137a71457b4005ee6d0bc2cada
author Steve Dower <steve.dower@microsoft.com> Sat Aug 15 14:38:29 2015 -0700
committer Steve Dower <steve.dower@microsoft.com> Sat Aug 15 14:38:29 2015 -0700
tree c8b81fcca8d0a3d7179ef02fc04a79620b978390
parent 79c878d5f24d58fe09e842f9a1cc13d6cf560aab
parent e6894d6256d000abd2c5ab7bb35b330d7a51d443

Merge with 3.5

Tools/msi/build.bat

diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat
index 5ae512f..716934a 100644
--- a/Tools/msi/build.bat
+++ b/Tools/msi/build.bat
@@ -7,6 +7,7 @@
 set BUILDX64=

 set BUILDDOC=

 set BUILDPX=

+set BUILDPACK=

 

 :CheckOpts

 if "%~1" EQU "-h" goto Help

@@ -14,6 +15,7 @@
 if "%~1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts

 if "%~1" EQU "--doc" (set BUILDDOC=1) && shift && goto CheckOpts

 if "%~1" EQU "--test-marker" (set BUILDPX=1) && shift && goto CheckOpts

+if "%~1" EQU "--pack" (set BUILDPACK=1) && shift && goto CheckOpts

 

 if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)

 

@@ -41,6 +43,9 @@
 if defined BUILDPX (

     set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true

 )

+if defined BUILDPACK (

+    set BUILD_CMD=%BUILD_CMD% /p:Pack=true

+)

 

 if defined BUILDX86 (

     "%PCBUILD%win32\python.exe" "%D%get_wix.py"

@@ -56,9 +61,10 @@
 exit /B 0

 

 :Help

-echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker]

+echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker] [--pack]

 echo.

 echo    -x86                Build x86 installers

 echo    -x64                Build x64 installers

 echo    --doc               Build CHM documentation

 echo    --test-marker       Build installers with 'x' markers

+echo    --pack              Embed core MSIs into installer

Tools/msi/bundle/snapshot.wixproj

diff --git a/Tools/msi/bundle/snapshot.wixproj b/Tools/msi/bundle/snapshot.wixproj
index 8fe95a8..cc45043 100644
--- 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>