mirror of https://github.com/python/cpython
I've spend some time to automate more steps of the build process. Now bzip2, bsddb, sqlite and openssl are automatically build by prelink steps.
I had to use some tricks to build openssl for 32 and 64bit CPUs in two separate build dirs.
This commit is contained in:
Christian Heimes
parent
a6b46357f6
commit
97e8029d0b
|
|
@ -54,10 +54,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(bsddbDir)
if exist Debug\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build Debug /project db_static
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
|
||||
AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -121,10 +122,11 @@
|
|||
/>
|
||||
<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"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
|
||||
AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -191,10 +193,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
|
||||
AdditionalDependencies="$(bsddbDir)\Release\libdb44s.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -264,10 +267,11 @@
|
|||
/>
|
||||
<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"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
|
||||
AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
|
|
@ -54,10 +54,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"
|
||||
AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -121,10 +122,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"
|
||||
AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -191,10 +193,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"
|
||||
AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -264,10 +267,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(sqlite3Dir)\sqlite3.lib"
|
||||
AdditionalDependencies="$(sqlite3Dir)\$(PlatformName)\sqlite3.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="python_d.exe build_ssl.py $(ConfigurationName) -a"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalIncludeDirectories="$(opensslDir)\inc32"
|
||||
AdditionalIncludeDirectories="$(opensslDir)\inc64"
|
||||
PreprocessorDefinitions="_SOCKET_EXPORTS"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
|
|
@ -121,11 +121,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="python_d.exe build_ssl.py $(ConfigurationName) -a"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
|
||||
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -191,7 +191,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) -a"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
|
|
@ -250,7 +250,7 @@
|
|||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
EnableIntrinsicFunctions="true"
|
||||
AdditionalIncludeDirectories="$(opensslDir)\inc32"
|
||||
AdditionalIncludeDirectories="$(opensslDir)\inc64"
|
||||
PreprocessorDefinitions="_SOCKET_EXPORTS"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="3"
|
||||
|
|
@ -264,11 +264,11 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) -a"
|
||||
CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
|
||||
AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
@echo off
|
||||
rem Try to find the AMD64 assembler and call it with the supplied arguments.
|
||||
|
||||
set MLEXE=Microsoft Platform SDK\Bin\Win64\x86\AMD64\ml64.EXE
|
||||
|
||||
rem For the environment variables see also
|
||||
rem http://msdn.microsoft.com/library/en-us/win64/win64/wow64_implementation_details.asp
|
||||
|
||||
if exist "%ProgramFiles%\%MLEXE%" (
|
||||
set ML64="%ProgramFiles%\%MLEXE%"
|
||||
) else if exist "%ProgramW6432%\%MLEXE%" (
|
||||
set ML64="%ProgramW6432%\%MLEXE%"
|
||||
) else (
|
||||
set ML64=ml64.exe
|
||||
)
|
||||
|
||||
%ML64% %*
|
||||
|
|
@ -1 +1 @@
|
|||
@%comspec% /k env.bat
|
||||
@%comspec% /k env.bat %*
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
if "%1" == "ReleaseAMD64" call "%MSSdk%\SetEnv" /XP64 /RETAIL
|
||||
|
||||
@echo off
|
||||
if not defined HOST_PYTHON (
|
||||
if %1 EQU Debug (
|
||||
|
|
@ -10,5 +8,5 @@ if not defined HOST_PYTHON (
|
|||
if not exist python30.dll exit 1
|
||||
)
|
||||
)
|
||||
%HOST_PYTHON% build_ssl.py %1 %2
|
||||
%HOST_PYTHON% build_ssl.py %1 %2 %3
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# it should configure and build SSL, then build the _ssl and _hashlib
|
||||
# Python extensions without intervention.
|
||||
|
||||
import os, sys, re
|
||||
import os, sys, re, shutil
|
||||
|
||||
# Find all "foo.exe" files on the PATH.
|
||||
def find_all_on_path(filename, extras = None):
|
||||
|
|
@ -86,38 +86,58 @@ def find_best_ssl_dir(sources):
|
|||
sys.stdout.flush()
|
||||
return best_name
|
||||
|
||||
def fix_makefile(makefile, m32):
|
||||
"""Fix makefile for 64bit
|
||||
|
||||
Replace 32 with 64bit directories
|
||||
"""
|
||||
if not os.path.isfile(m32):
|
||||
return
|
||||
with open(m32) as fin:
|
||||
with open(makefile, 'w') as fout:
|
||||
for line in fin:
|
||||
line = line.replace("=tmp32", "=tmp64")
|
||||
line = line.replace("=out32", "=out64")
|
||||
line = line.replace("=inc32", "=inc64")
|
||||
# force 64 bit machine
|
||||
line = line.replace("MKLIB=lib", "MKLIB=lib /MACHINE:X64")
|
||||
line = line.replace("LFLAGS=", "LFLAGS=/MACHINE:X64 ")
|
||||
# don't link against the lib on 64bit systems
|
||||
line = line.replace("bufferoverflowu.lib", "")
|
||||
fout.write(line)
|
||||
os.unlink(m32)
|
||||
|
||||
def run_configure(configure, do_script):
|
||||
print("perl Configure "+configure)
|
||||
os.system("perl Configure "+configure)
|
||||
print(do_script)
|
||||
os.system(do_script)
|
||||
|
||||
def main():
|
||||
build_all = "-a" in sys.argv
|
||||
if sys.argv[1] == "Release":
|
||||
arch = "x86"
|
||||
debug = False
|
||||
configure = "VC-WIN32"
|
||||
do_script = "ms\\do_nasm"
|
||||
makefile = "ms\\nt.mak"
|
||||
elif sys.argv[1] == "Debug":
|
||||
arch = "x86"
|
||||
debug = True
|
||||
else:
|
||||
raise ValueError(str(sys.argv))
|
||||
|
||||
if sys.argv[2] == "Win32":
|
||||
arch = "x86"
|
||||
configure = "VC-WIN32"
|
||||
do_script = "ms\\do_nasm"
|
||||
makefile="ms\\d32.mak"
|
||||
elif sys.argv[1] == "ReleaseItanium":
|
||||
arch = "ia64"
|
||||
debug = False
|
||||
configure = "VC-WIN64I"
|
||||
do_script = "ms\\do_win64i"
|
||||
makefile = "ms\\nt.mak"
|
||||
os.environ["VSEXTCOMP_USECL"] = "MS_ITANIUM"
|
||||
elif sys.argv[1] == "ReleaseAMD64":
|
||||
makefile="ms\\nt.mak"
|
||||
m32 = makefile
|
||||
elif sys.argv[2] == "x64":
|
||||
arch="amd64"
|
||||
debug=False
|
||||
configure = "VC-WIN64A"
|
||||
do_script = "ms\\do_win64a"
|
||||
makefile = "ms\\nt.mak"
|
||||
os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
|
||||
makefile = "ms\\nt64.mak"
|
||||
m32 = makefile.replace('64', '')
|
||||
#os.environ["VSEXTCOMP_USECL"] = "MS_OPTERON"
|
||||
else:
|
||||
raise ValueError(str(sys.argv))
|
||||
|
||||
make_flags = ""
|
||||
if build_all:
|
||||
make_flags = "-a"
|
||||
|
|
@ -138,6 +158,10 @@ def main():
|
|||
old_cd = os.getcwd()
|
||||
try:
|
||||
os.chdir(ssl_dir)
|
||||
# rebuild makefile when we do the role over from 32 to 64 build
|
||||
if arch == "amd64" and os.path.isfile(m32) and not os.path.isfile(makefile):
|
||||
os.unlink(m32)
|
||||
|
||||
# If the ssl makefiles do not exist, we invoke Perl to generate them.
|
||||
# Due to a bug in this script, the makefile sometimes ended up empty
|
||||
# Force a regeneration if it is.
|
||||
|
|
@ -154,6 +178,9 @@ def main():
|
|||
# build makefile so we generate it here:
|
||||
os.system("perl util\mk1mf.pl debug "+configure+" >"+makefile)
|
||||
|
||||
if arch == "amd64":
|
||||
fix_makefile(makefile, m32)
|
||||
|
||||
# Now run make.
|
||||
makeCommand = "nmake /nologo PERL=\"%s\" -f \"%s\"" %(perl, makefile)
|
||||
print("Executing ssl makefiles:", makeCommand)
|
||||
|
|
|
|||
|
|
@ -54,10 +54,12 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Build libbz2"
|
||||
CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0
if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc clean
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
|
||||
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -120,10 +122,12 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Build libbz2"
|
||||
CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0
if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc clean
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
|
||||
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -189,10 +193,12 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Build libbz2"
|
||||
CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0
if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc clean
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
|
||||
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -261,10 +267,12 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
Description="Build libbz2"
|
||||
CommandLine="cd $(bz2Dir)
if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0
if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc lib
copy libbz2.lib $(PlatformName)-$(ConfigurationName)
nmake /nologo /f makefile.msc clean
"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
|
||||
AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
@echo off
|
||||
set VS9=%ProgramFiles%\Microsoft Visual Studio 9.0
|
||||
call "%VS9%\VC\vcvarsall.bat"
|
||||
echo Build environments: x86, ia64, amd64, x86_amd64, x86_ia64
|
||||
echo.
|
||||
call "%VS9%\VC\vcvarsall.bat" %1
|
||||
|
|
|
|||
|
|
@ -19,148 +19,6 @@
|
|||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
InlineFunctionExpansion="1"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/make_buildinfo.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
InlineFunctionExpansion="1"
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
MinimalRebuild="true"
|
||||
RuntimeLibrary="1"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/make_buildinfo.exe"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
ConfigurationType="1"
|
||||
|
|
@ -231,80 +89,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
InlineFunctionExpansion="1"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
RuntimeLibrary="0"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)/make_buildinfo.exe"
|
||||
LinkIncremental="1"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
|
|
|||
|
|
@ -96,244 +96,6 @@
|
|||
CommandLine="$(TargetFileName) > ..\PC\python_nt.h"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine=".\make_versioninfo.exe >..\PC\pythonnt_rc.h
"
|
||||
Outputs="..\PC\pythonnt_rc.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile=".\./make_versioninfo.exe"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
BaseAddress="0x1d000000"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="$(TargetFileName) > ..\PC\python_nt.h"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine=".\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h
"
|
||||
Outputs="..\PC\pythonnt_rc_d.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
BrowseInformation="1"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="./make_versioninfo_d.exe"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
BaseAddress="0x1d000000"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="$(TargetFileName) > ..\PC\python_nt_d.h"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets=".\pyproject.vsprops"
|
||||
UseOfMFC="0"
|
||||
ATLMinimizesCRunTimeLibraryUsage="false"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
CommandLine=".\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h
"
|
||||
Outputs="..\PC\pythonnt_rc_d.h"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
TargetEnvironment="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories=""
|
||||
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
|
||||
RuntimeLibrary="3"
|
||||
UsePrecompiledHeader="0"
|
||||
BrowseInformation="1"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="./make_versioninfo_d.exe"
|
||||
GenerateDebugInformation="true"
|
||||
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
|
||||
SubSystem="1"
|
||||
BaseAddress="0x1d000000"
|
||||
TargetMachine="17"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="$(TargetFileName) > ..\PC\python_nt_d.h"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
</References>
|
||||
|
|
|
|||
|
|
@ -114,10 +114,9 @@ Global
|
|||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Release|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Release|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Release|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32
|
||||
{F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32
|
||||
|
|
@ -154,10 +153,9 @@ Global
|
|||
{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|Win32.Build.0 = Release|Win32
|
||||
{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.ActiveCfg = Release|x64
|
||||
{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Debug|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Debug|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32
|
||||
{C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32
|
||||
|
|
|
|||
|
|
@ -41,22 +41,22 @@
|
|||
/>
|
||||
<UserMacro
|
||||
Name="bsddbDir"
|
||||
Value="..\..\db-4.4.20\build_win32"
|
||||
Value="..\..\db-4.4.20\build_win32\"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="sqlite3Dir"
|
||||
Value="..\..\sqlite-source-3.3.4"
|
||||
Value="..\..\sqlite-source-3.3.4\"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="bz2Dir"
|
||||
Value="..\..\bzip2-1.0.3"
|
||||
Value="..\..\bzip2-1.0.3\"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="opensslDir"
|
||||
Value="..\..\openssl-0.9.8g"
|
||||
Value="..\..\openssl-0.9.8g\"
|
||||
/>
|
||||
<UserMacro
|
||||
Name="tcltkDir"
|
||||
Value="..\..\tcltk"
|
||||
Value="..\..\tcltk\"
|
||||
/>
|
||||
</VisualStudioPropertySheet>
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="$(OutDir)\python.exe"
|
||||
SubSystem="1"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -142,6 +143,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="$(OutDir)\python.exe"
|
||||
SubSystem="1"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -216,6 +218,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="$(OutDir)\python_d.exe"
|
||||
SubSystem="1"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -291,6 +294,7 @@
|
|||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="odbccp32.lib"
|
||||
OutputFile="$(OutDir)\python_d.exe"
|
||||
SubSystem="1"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\pythonw_d.exe"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -133,6 +134,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\pythonw_d.exe"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -206,6 +208,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\pythonw.exe"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
@ -281,6 +284,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="$(OutDir)\pythonw.exe"
|
||||
SubSystem="2"
|
||||
StackReserveSize="2000000"
|
||||
BaseAddress="0x1d000000"
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="winmm.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
@ -120,6 +121,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalDependencies="winmm.lib"
|
||||
LinkIncremental="2"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue