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.
........

diff --git a/PCbuild/_msi.vcproj b/PCbuild/_msi.vcproj
index cbf20ea1d31fbe095f3422bbd5239d7c20b03dd5..be2a92cfad90f6661c697140d495ae0f49a607b1 100644 (file)
--- 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 4b949225d183bb0932359fda218140d8bcf2e598..19400a9f9460d16e23b504897ec0ccc6e771d252 100644 (file)
--- 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