[Python-3000-checkins] r58136 - in python/branches/py3k: Tools/buildbot/buildmsi.bat
martin.v.loewis
python-3000-checkins at python.org
Thu Sep 13 15:33:46 CEST 2007
Author: martin.v.loewis
Date: Thu Sep 13 15:33:46 2007
New Revision: 58136
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/buildbot/buildmsi.bat
Log:
Merged revisions 58133-58135 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r58133 | martin.v.loewis | 2007-09-13 11:59:00 +0200 (Do, 13 Sep 2007) | 2 lines
Add more automated actions.
........
r58134 | martin.v.loewis | 2007-09-13 12:38:42 +0200 (Do, 13 Sep 2007) | 2 lines
Fix path.
........
r58135 | martin.v.loewis | 2007-09-13 15:27:27 +0200 (Do, 13 Sep 2007) | 2 lines
More path fixes.
........
Modified: python/branches/py3k/Tools/buildbot/buildmsi.bat
==============================================================================
--- python/branches/py3k/Tools/buildbot/buildmsi.bat (original)
+++ python/branches/py3k/Tools/buildbot/buildmsi.bat Thu Sep 13 15:33:46 2007
@@ -1,10 +1,24 @@
@rem Used by the buildbot "buildmsi" step.
+
cmd /c Tools\buildbot\external.bat
+ at rem build release versions of things
call "%VS71COMNTOOLS%vsvars32.bat"
+if not exist ..\db-4.4.20\build_win32\release\libdb44s.lib (
+ devenv ..\db-4.4.20\build_win32\Berkeley_DB.sln /build Release /project db_static
+)
+
+ at rem build Python
cmd /q/c Tools\buildbot\kill_python.bat
devenv.com /useenv /build Release PCbuild\pcbuild.sln
+
+ at rem build the documentation
bash.exe -c 'cd Doc;make PYTHON=python2.5 update htmlhelp'
-"%ProgramFiles%\HTML Help Workshop\hhc.exe Doc\build\htmlhelp\pydoc.hhp
-cd Tools\msi
+"%ProgramFiles%\HTML Help Workshop\hhc.exe" Doc\build\htmlhelp\pydoc.hhp
+
+ at rem buold the MSI file
+cd PC
+nmake /f icons.mak
+cd ..\Tools\msi
del *.msi
+nmake /f msisupport.mak
%HOST_PYTHON% msi.py
More information about the Python-3000-checkins
mailing list