[Python-checkins] r60551 - in python/trunk: Lib/distutils/command/build_ext.py PCbuild/_bsddb.vcproj PCbuild/build.bat PCbuild/readme.txt
christian.heimes
python-checkins at python.org
Sun Feb 3 15:34:19 CET 2008
Author: christian.heimes
Date: Sun Feb 3 15:34:18 2008
New Revision: 60551
Modified:
python/trunk/Lib/distutils/command/build_ext.py
python/trunk/PCbuild/_bsddb.vcproj
python/trunk/PCbuild/build.bat
python/trunk/PCbuild/readme.txt
Log:
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
Modified: python/trunk/Lib/distutils/command/build_ext.py
==============================================================================
--- python/trunk/Lib/distutils/command/build_ext.py (original)
+++ python/trunk/Lib/distutils/command/build_ext.py Sun Feb 3 15:34:18 2008
@@ -182,13 +182,13 @@
self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
if MSVC_VERSION == 9:
self.library_dirs.append(os.path.join(sys.exec_prefix,
- 'PCBuild9'))
+ 'PCbuild'))
elif MSVC_VERSION == 8:
self.library_dirs.append(os.path.join(sys.exec_prefix,
- 'PCBuild8', 'win32release'))
+ 'PC', 'VS8.0', 'win32release'))
else:
self.library_dirs.append(os.path.join(sys.exec_prefix,
- 'PCBuild'))
+ 'PC', 'VS7.1'))
# OS/2 (EMX) doesn't support Debug vs Release builds, but has the
# import libraries in its "Config" subdirectory
Modified: python/trunk/PCbuild/_bsddb.vcproj
==============================================================================
--- python/trunk/PCbuild/_bsddb.vcproj (original)
+++ python/trunk/PCbuild/_bsddb.vcproj Sun Feb 3 15:34:18 2008
@@ -52,7 +52,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build Debug /project db_static
"
+ CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -115,7 +115,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv
"
+ CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
vcbuild /useenv db_static.vcproj "Debug AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -178,7 +178,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
+ CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -242,7 +242,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
+ CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -305,7 +305,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
+ CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -369,7 +369,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
+ CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -433,7 +433,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
+ CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release|Win32"
"
/>
<Tool
Name="VCLinkerTool"
@@ -497,7 +497,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
+ CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
vcbuild /useenv db_static.vcproj "Release AMD64|Win32"
"
/>
<Tool
Name="VCLinkerTool"
Modified: python/trunk/PCbuild/build.bat
==============================================================================
--- python/trunk/PCbuild/build.bat (original)
+++ python/trunk/PCbuild/build.bat Sun Feb 3 15:34:18 2008
@@ -12,6 +12,6 @@
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
-set cmd=devenv pcbuild.sln %build% "%conf%|%platf%"
+set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%"
echo %cmd%
%cmd%
Modified: python/trunk/PCbuild/readme.txt
==============================================================================
--- python/trunk/PCbuild/readme.txt (original)
+++ python/trunk/PCbuild/readme.txt Sun Feb 3 15:34:18 2008
@@ -23,7 +23,6 @@
cross compiling x64 builds on a 32bit OS possible the x64 builds require a
32bit version of Python.
-
NOTE:
You probably don't want to build most of the other subprojects, unless
you're building an entire Python distribution from scratch, or
@@ -192,10 +191,11 @@
svn export http://svn.python.org/projects/external/db-4.4.20
Next open the solution file db-4.4.20\build_win32\Berkeley_DB.sln with
- Visual Studio and convert the projects to the new format. The standard
- and professional version of VS 2008 builds the necessary libraries
- in a pre-link step of _bsddb. However the express edition is missing
- some pieces and you have to build the libs yourself.
+ Visual Studio and convert the projects to the new format. VS 2008
+ builds the necessary libraries in a pre-link step of _bsddb. You
+ have to add "$(VCInstallDir)vcpackages" to the search path first
+ (Tools -> Options -> Projects and Solutions -> VC++ Directories,
+ Platform: Win32, Show directories for: Executable files).
The _bsddb subprojects depends only on the db_static project of
Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug"
More information about the Python-checkins
mailing list