diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 12:11:40 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-04-13 12:11:40 -0500 |
| commit | 2430f2ce58be57e7a1459501dca20e6f01773039 (patch) | |
| tree | 01cd10d4977045e06a2f05a85ff615573105b023 /Tools/msi/build.bat | |
| parent | 023f0a42831146aad5f64979183511ca4792a3e4 (diff) | |
| parent | 2343b1bb9f828643bc9f2a08dcaa95d6b4ca55b7 (diff) | |
| download | cpython-2430f2ce58be57e7a1459501dca20e6f01773039.tar.gz | |
Closes #17202: Merge with 3.4
Diffstat (limited to 'Tools/msi/build.bat')
| -rw-r--r-- | Tools/msi/build.bat | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index efee66bc25..4dfa5fb8bd 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -1,46 +1,46 @@ -@echo off -setlocal -set D=%~dp0 -set PCBUILD=%D%..\..\PCBuild\ - -set BUILDX86= -set BUILDX64= -set BUILDDOC= - -:CheckOpts -if '%1'=='-x86' (set BUILDX86=1) && shift && goto CheckOpts -if '%1'=='-x64' (set BUILDX64=1) && shift && goto CheckOpts -if '%1'=='--doc' (set BUILDDOC=1) && shift && goto CheckOpts - -if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1) - -call "%PCBUILD%env.bat" x86 - -if defined BUILDX86 ( - call "%PCBUILD%build.bat" -d - if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" - if errorlevel 1 goto :eof -) -if defined BUILDX64 ( - call "%PCBUILD%build.bat" -p x64 -d - if errorlevel 1 goto :eof - call "%PCBUILD%build.bat" -p x64 - if errorlevel 1 goto :eof -) - -if defined BUILDDOC ( - call "%PCBUILD%..\Doc\make.bat" htmlhelp - if errorlevel 1 goto :eof -) - -if defined BUILDX86 ( - "%PCBUILD%win32\python.exe" "%D%get_wix.py" - msbuild "%D%bundle\snapshot.wixproj" - if errorlevel 1 goto :eof -) -if defined BUILDX64 ( - "%PCBUILD%amd64\python.exe" "%D%get_wix.py" - msbuild "%D%bundle\snapshot.wixproj" /p:Platform=x64 - if errorlevel 1 goto :eof -) +@echo off
+setlocal
+set D=%~dp0
+set PCBUILD=%D%..\..\PCBuild\
+
+set BUILDX86=
+set BUILDX64=
+set BUILDDOC=
+
+:CheckOpts
+if '%1'=='-x86' (set BUILDX86=1) && shift && goto CheckOpts
+if '%1'=='-x64' (set BUILDX64=1) && shift && goto CheckOpts
+if '%1'=='--doc' (set BUILDDOC=1) && shift && goto CheckOpts
+
+if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
+
+call "%PCBUILD%env.bat" x86
+
+if defined BUILDX86 (
+ call "%PCBUILD%build.bat" -d
+ if errorlevel 1 goto :eof
+ call "%PCBUILD%build.bat"
+ if errorlevel 1 goto :eof
+)
+if defined BUILDX64 (
+ call "%PCBUILD%build.bat" -p x64 -d
+ if errorlevel 1 goto :eof
+ call "%PCBUILD%build.bat" -p x64
+ if errorlevel 1 goto :eof
+)
+
+if defined BUILDDOC (
+ call "%PCBUILD%..\Doc\make.bat" htmlhelp
+ if errorlevel 1 goto :eof
+)
+
+if defined BUILDX86 (
+ "%PCBUILD%win32\python.exe" "%D%get_wix.py"
+ msbuild "%D%bundle\snapshot.wixproj"
+ if errorlevel 1 goto :eof
+)
+if defined BUILDX64 (
+ "%PCBUILD%amd64\python.exe" "%D%get_wix.py"
+ msbuild "%D%bundle\snapshot.wixproj" /p:Platform=x64
+ if errorlevel 1 goto :eof
+)
|