mirror of
https://github.com/python/cpython.git
synced 2025-09-26 18:29:57 +00:00
Fixed paths to Windows build directories in build_ext.py
Use vsbuild instead of devenv in build.bat and _bsddb.vcproj
This commit is contained in:
Christian Heimes
parent
63cdb867f0
commit
3af3ecca92
4 changed files with 17 additions and 17 deletions
|
|
@ -182,13 +182,13 @@ class build_ext (Command):
|
||||||
self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
|
self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
|
||||||
if MSVC_VERSION == 9:
|
if MSVC_VERSION == 9:
|
||||||
self.library_dirs.append(os.path.join(sys.exec_prefix,
|
self.library_dirs.append(os.path.join(sys.exec_prefix,
|
||||||
'PCBuild9'))
|
'PCbuild'))
|
||||||
elif MSVC_VERSION == 8:
|
elif MSVC_VERSION == 8:
|
||||||
self.library_dirs.append(os.path.join(sys.exec_prefix,
|
self.library_dirs.append(os.path.join(sys.exec_prefix,
|
||||||
'PCBuild8', 'win32release'))
|
'PC', 'VS8.0', 'win32release'))
|
||||||
else:
|
else:
|
||||||
self.library_dirs.append(os.path.join(sys.exec_prefix,
|
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
|
# OS/2 (EMX) doesn't support Debug vs Release builds, but has the
|
||||||
# import libraries in its "Config" subdirectory
|
# import libraries in its "Config" subdirectory
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -115,7 +115,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -178,7 +178,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -242,7 +242,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -305,7 +305,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -369,7 +369,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -433,7 +433,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
@ -497,7 +497,7 @@
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
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
|
<Tool
|
||||||
Name="VCLinkerTool"
|
Name="VCLinkerTool"
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,6 @@ if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
|
||||||
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
|
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
|
||||||
if "%1"=="-r" (set build=/rebuild) & 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%
|
echo %cmd%
|
||||||
%cmd%
|
%cmd%
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ Solution" or F6 takes care of dependencies except for x64 builds. To make
|
||||||
cross compiling x64 builds on a 32bit OS possible the x64 builds require a
|
cross compiling x64 builds on a 32bit OS possible the x64 builds require a
|
||||||
32bit version of Python.
|
32bit version of Python.
|
||||||
|
|
||||||
|
|
||||||
NOTE:
|
NOTE:
|
||||||
You probably don't want to build most of the other subprojects, unless
|
You probably don't want to build most of the other subprojects, unless
|
||||||
you're building an entire Python distribution from scratch, or
|
you're building an entire Python distribution from scratch, or
|
||||||
|
|
@ -192,10 +191,11 @@ _bsddb
|
||||||
svn export http://svn.python.org/projects/external/db-4.4.20
|
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
|
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
|
Visual Studio and convert the projects to the new format. VS 2008
|
||||||
and professional version of VS 2008 builds the necessary libraries
|
builds the necessary libraries in a pre-link step of _bsddb. You
|
||||||
in a pre-link step of _bsddb. However the express edition is missing
|
have to add "$(VCInstallDir)vcpackages" to the search path first
|
||||||
some pieces and you have to build the libs yourself.
|
(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
|
The _bsddb subprojects depends only on the db_static project of
|
||||||
Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug"
|
Berkeley DB. You have to choose either "Release", "Release AMD64", "Debug"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue