diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-07-07 18:39:59 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-07-07 18:39:59 (GMT) |
| commit | e12fa657447c91356b3c52dac9b1e4da937bd26c (patch) | |
| tree | 3013b95e11de6fb2e2769e791a1810ebdef9ee1c /Tools/buildbot/buildmsi.bat | |
| parent | b132069ea45329c30a7caa067f6f5ed0285c8c88 (diff) | |
| download | cpython-e12fa657447c91356b3c52dac9b1e4da937bd26c.zip cpython-e12fa657447c91356b3c52dac9b1e4da937bd26c.tar.gz cpython-e12fa657447c91356b3c52dac9b1e4da937bd26c.tar.bz2 | |
Issue #21907: Improved the batch scripts provided for building Python.
The user-facing scripts in PCbuild have been updated to be easier to use
and the buildbot scripts in Tools\buildbot have been updated to use the
user-facing scripts in PCbuild wherever possible.
Diffstat (limited to 'Tools/buildbot/buildmsi.bat')
| -rw-r--r-- | Tools/buildbot/buildmsi.bat | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Tools/buildbot/buildmsi.bat b/Tools/buildbot/buildmsi.bat index ae93e67..f414c22 100644 --- a/Tools/buildbot/buildmsi.bat +++ b/Tools/buildbot/buildmsi.bat @@ -1,21 +1,20 @@ @rem Used by the buildbot "buildmsi" step. +setlocal -cmd /c Tools\buildbot\external.bat +set cwd=%CD% @rem build release versions of things -call "%VS100COMNTOOLS%vsvars32.bat" - -@rem build Python -msbuild /p:useenv=true PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32 +call "%~dp0build.bat" -c Release @rem build the documentation -bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp' -"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\python26a3.hhp +call "%~dp0..\..\Doc\make.bat" htmlhelp @rem build the MSI file -cd PC +call "%VS100COMNTOOLS%..\..\VC\vcvarsall.bat" x86 +cd "%~dp0..\..\PC" nmake /f icons.mak cd ..\Tools\msi del *.msi nmake /f msisupport.mak %HOST_PYTHON% msi.py +cd "%cwd%" |