summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-09-14 07:03:21 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-09-14 07:03:21 (GMT)
commita5b8e04bd572099095fbf6b32dadde637b6e6f7b (patch)
tree304a6faa5cb7117ab510bc61b6565f6823e24dcb
parent5a885d7f3a65ee9aee351e7c557d65faf32676f5 (diff)
downloadcpython-a5b8e04bd572099095fbf6b32dadde637b6e6f7b.zip
cpython-a5b8e04bd572099095fbf6b32dadde637b6e6f7b.tar.gz
cpython-a5b8e04bd572099095fbf6b32dadde637b6e6f7b.tar.bz2
Merged revisions 58149-58150 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r58149 | martin.v.loewis | 2007-09-14 08:49:43 +0200 (Fr, 14 Sep 2007) | 3 lines Clean both Release and Debug projects, to support the MSI builder. ........ r58150 | martin.v.loewis | 2007-09-14 08:50:21 +0200 (Fr, 14 Sep 2007) | 2 lines Rename import library for debug build to _msi_d.lib. ........
-rw-r--r--PCbuild/_msi.vcproj2
-rw-r--r--Tools/buildbot/clean.bat1
2 files changed, 2 insertions, 1 deletions
diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj
index cbf20ea..be2a92c 100644
--- a/PCbuild/_msi.vcproj
+++ b/PCbuild/_msi.vcproj
@@ -42,7 +42,7 @@
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\./_msi_d.pdb"
BaseAddress="0x1D160000"
- ImportLibrary=".\./_msi.lib"
+ ImportLibrary=".\./_msi_d.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 4b94922..19400a9 100644
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -3,4 +3,5 @@ call "%VS71COMNTOOLS%vsvars32.bat"
cd PCbuild
@echo Deleting .pyc/.pyo files ...
python_d.exe rmpyc.py
+devenv.com /clean Release pcbuild.sln
devenv.com /clean Debug pcbuild.sln