[Python-checkins] cpython (3.5): Enables building compressed Windows test builds with --pack option.

[steve.dower]

https://hg.python.org/cpython/rev/70d422efa742
changeset:   97391:70d422efa742
branch:      3.5
parent:      97387:69a8b05f27b4
user:        Steve Dower <steve.dower at microsoft.com>
date:        Sat Aug 15 14:38:16 2015 -0700
summary:
  Enables building compressed Windows test builds with --pack option.

files:
  Tools/msi/build.bat               |  8 +++++++-
  Tools/msi/bundle/snapshot.wixproj |  7 ++++++-
  2 files changed, 13 insertions(+), 2 deletions(-)


diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat
--- 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
diff --git a/Tools/msi/bundle/snapshot.wixproj b/Tools/msi/bundle/snapshot.wixproj
--- 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>

-- 
Repository URL: https://hg.python.org/cpython