]> granicus.if.org Git - python/commitdiff
I've spend some time to automate more steps of the build process. Now bzip2, bsddb...
authorChristian Heimes <christian@cheimes.de>
Mon, 19 Nov 2007 08:36:32 +0000 (08:36 +0000)
committerChristian Heimes <christian@cheimes.de>
Mon, 19 Nov 2007 08:36:32 +0000 (08:36 +0000)
I had to use some tricks to build openssl for 32 and 64bit CPUs in two separate build dirs.

16 files changed:
PCbuild9/_bsddb.vcproj
PCbuild9/_sqlite3.vcproj
PCbuild9/_ssl.vcproj
PCbuild9/amd64_ml64.bat [deleted file]
PCbuild9/build_env.bat
PCbuild9/build_ssl.bat
PCbuild9/build_ssl.py
PCbuild9/bz2.vcproj
PCbuild9/env.bat
PCbuild9/make_buildinfo.vcproj
PCbuild9/make_versioninfo.vcproj
PCbuild9/pcbuild.sln
PCbuild9/pyproject.vsprops
PCbuild9/python.vcproj
PCbuild9/pythonw.vcproj
PCbuild9/winsound.vcproj

index eea3eed0a2a874ccb204095c2e017d49cfe68743..e558036ee1d17f3affd3ed636800efc626aaccd2 100644 (file)
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build Debug /project db_static&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
+                               AdditionalDependencies="$(bsddbDir)\Debug\libdb44sd.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Debug_AMD64\libdb44sd.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Debug AMD64&quot; /project db_static /useenv"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
+                               AdditionalDependencies="$(bsddbDir)\Debug_AMD64\libdb44sd.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release\libdb44s.lib exit 0&#x0D;&#x0A;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"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(bsddbDir)&#x0D;&#x0A;if exist Release_AMD64\libdb44s.lib exit 0&#x0D;&#x0A;devenv Berkeley_DB.sln /build &quot;Release AMD64&quot; /project db_static /useenv"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bsddbDir)\$(ConfigurationName)\libdb44s.lib"
+                               AdditionalDependencies="$(bsddbDir)\Release_AMD64\libdb44s.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
index 2ae9cb131bc364557198025cbb33aa12f918c606..57b4bc64de8bcc695a202987391442ebebd7e014 100644 (file)
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(sqlite3Dir)&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;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"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(sqlite3Dir)&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;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"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(sqlite3Dir)&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;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"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               CommandLine="cd $(sqlite3Dir)&#x0D;&#x0A;if exist $(PlatformName)\sqlite3.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName) mkdir $(PlatformName)&#x0D;&#x0A;cd $(PlatformName)&#x0D;&#x0A;cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c&#x0D;&#x0A;link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def  /dll /out:sqlite3.dll *.obj&#x0D;&#x0A;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"
index 64b95daecdc627bba8509d96f05fb193b2e5131c..14cb70cca5d2c86dd20a3bbf091f134784bb74ab 100644 (file)
@@ -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"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
+                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
                                PreprocessorDefinitions="_SOCKET_EXPORTS"
                                UsePrecompiledHeader="0"
                        />
                        />
                        <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"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="python.exe build_ssl.py $(ConfigurationName) -a"
+                               CommandLine="python.exe build_ssl.py $(ConfigurationName) $(PlatformName) -a"
                        />
                        <Tool
                                Name="VCLinkerTool"
                        <Tool
                                Name="VCCLCompilerTool"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="$(opensslDir)\inc32"
+                               AdditionalIncludeDirectories="$(opensslDir)\inc64"
                                PreprocessorDefinitions="_SOCKET_EXPORTS"
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                        />
                        <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"
diff --git a/PCbuild9/amd64_ml64.bat b/PCbuild9/amd64_ml64.bat
deleted file mode 100644 (file)
index fa9acf1..0000000
+++ /dev/null
@@ -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% %*
index 3a8b16ded2b6a447ab7dee8453e1b1d8f7eb7466..4c67ae3ac253c791d740458fa21272445f07ca75 100644 (file)
@@ -1 +1 @@
-@%comspec% /k env.bat
+@%comspec% /k env.bat %*
index 46b3625e5d44e71650a22ccc0d0da2b891a94cf9..ba144463cbed62f6de101147f109a542ba288c6e 100644 (file)
@@ -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
 
index d9477deb7d8604c148d57985aa7c57fe8a9bc132..68e26d9b074d67f07d669d560ac1ae2512ab3e69 100644 (file)
@@ -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)
index 6ca85e3178d0839d4439ba9c355df17359eab3f8..407b3b9ce8e66705582c29afacb962cd8da01060 100644 (file)
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build libbz2"
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build libbz2"
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build libbz2"
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
+                               Description="Build libbz2"
+                               CommandLine="cd $(bz2Dir)&#x0D;&#x0A;if exist $(PlatformName)-$(ConfigurationName)\libbz2.lib exit 0&#x0D;&#x0A;if not exist $(PlatformName)-$(ConfigurationName) mkdir $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc lib&#x0D;&#x0A;copy libbz2.lib $(PlatformName)-$(ConfigurationName)&#x0D;&#x0A;nmake /nologo /f makefile.msc clean&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="$(bz2Dir)/$(ConfigurationName)/libbz2.lib"
+                               AdditionalDependencies="$(bz2Dir)\$(PlatformName)-$(ConfigurationName)\libbz2.lib"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
                                SubSystem="2"
index 73fbcd7c47994e89ec754e316e5fd3beacd38713..638b16c1064a4f33f22d098fc1152739d72256f2 100644 (file)
@@ -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
index 448c49bf89c6764293e7e0201802ffed4383bb1b..f5a53fe29e9adaa437b8539f0e4e49a04e3ccf1a 100644 (file)
        <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"
                                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>
index b34d4d3150082a37a67b0ea3d6cb292339337178..a1f31fda0a5f02a14e624984e97d0d05df09f993 100644 (file)
                                CommandLine="$(TargetFileName) &gt; ..\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 &gt;..\PC\pythonnt_rc.h&#x0D;&#x0A;"
-                               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) &gt; ..\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 &gt;..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-                               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) &gt; ..\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 &gt;..\PC\pythonnt_rc_d.h&#x0D;&#x0A;"
-                               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) &gt; ..\PC\python_nt_d.h"
-                       />
-               </Configuration>
        </Configurations>
        <References>
        </References>
index d20dd64c8d412fa65ac75235fb4b32888a73f076..ea0bc4af97f7afc4851712724ed45b16f14ec45e 100644 (file)
@@ -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
index 1f3ff0848142337ef5513a7510425af72d549c21..271f65e85a727a9d281f204470c5d27f62c25c3a 100644 (file)
        />
        <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>
index ba36272f6084c875e14d1693f57fa3c99e43905f..fa3c0e165f078415d8e941c0fb24712abd712f0e 100644 (file)
@@ -66,6 +66,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="odbccp32.lib"
+                               OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="odbccp32.lib"
+                               OutputFile="$(OutDir)\python.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="odbccp32.lib"
+                               OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="odbccp32.lib"
+                               OutputFile="$(OutDir)\python_d.exe"
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
index 6b9ec8e16c581576a3b6bdb53edbe660783d795b..c4ec4420c3eb0a4c635bf111538d14e1f212cc89 100644 (file)
@@ -61,6 +61,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\pythonw_d.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\pythonw_d.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\pythonw.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               OutputFile="$(OutDir)\pythonw.exe"
                                SubSystem="2"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
index a03d3d414fe0005d9be1f1c92163307adb9ef012..be03ba6b5d32f768bc10343b334d004179c87894 100644 (file)
@@ -56,6 +56,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="winmm.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="winmm.lib"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                                SubSystem="2"