diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-08-15 21:38:16 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-08-15 21:38:16 (GMT) |
| commit | e6894d6256d000abd2c5ab7bb35b330d7a51d443 (patch) | |
| tree | c2c186b4506de64fcd9812f342ee3471a9f682d7 /Tools/msi | |
| parent | a0bcfaff9af66f164e93bae129d9c9be84b3f3d9 (diff) | |
| download | cpython-e6894d6256d000abd2c5ab7bb35b330d7a51d443.zip cpython-e6894d6256d000abd2c5ab7bb35b330d7a51d443.tar.gz cpython-e6894d6256d000abd2c5ab7bb35b330d7a51d443.tar.bz2 | |
Enables building compressed Windows test builds with --pack option.
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/build.bat | 8 | ||||
| -rw-r--r-- | 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 index 5ae512f..716934a 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -7,6 +7,7 @@ set BUILDX86= set BUILDX64=
set BUILDDOC=
set BUILDPX=
+set BUILDPACK=
:CheckOpts
if "%~1" EQU "-h" goto Help
@@ -14,6 +15,7 @@ if "%~1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts 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 @@ set BUILD_CMD="%D%bundle\snapshot.wixproj" 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 @@ if defined BUILDX64 ( 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 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> |