|
Size: 14810
Comment:
|
Size: 24230
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 4: | Line 4: |
| This is a draft related to [[issue 1321|http://bugs.python.org/issue1321]]. It only concerns 32 bits builds for the moment. }}} |
This is a draft related to [[issue 13210|http://bugs.python.org/issue13210]]. }}} == Issues == List of issues related to Visual Studio 2010: * [[http://bugs.python.org/issue13210|issue 13210]]: parent issue * [[http://bugs.python.org/issue10469|issue 10469]]: test_asyncore blocks forever * [[http://bugs.python.org/issue4431|issue 4431]]: manifest handling * [[http://bugs.python.org/issue7833|issue7833]]: patch to avoid the use of manifests * [[http://bugs.python.org/issue6807|issue6807]]: problem with msi for installer creation * [[http://bugs.python.org/issue2286|issue2286]]: crash on test_marshal * [[http://hg.python.org/cpython/rev/78e40316e023|patch wininst]] |
| Line 16: | Line 32: |
| set VS100COMNTOOLS="C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\" |
For 32 bits: |
| Line 20: | Line 35: |
| SET PATH=%PATH%;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin ## Check: it is necessary to have svn in the PATH }}} |
For 64 bits: "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64 }}} '''It is necessary to have svn in the PATH''' |
| Line 25: | Line 42: |
| Line 34: | Line 50: |
| # modify tcl-8.5.2.1/generic/tclPosixStr.c - remove lines 347 - 407 - 795 - 855 # modify tcl-8.5.2.1/win/makefile.vc - remove -debug:full # modify tk-8.5.2.0/win/makefile.vc - remove -debug:full |
{{{ diff -r 97fbe6d3b5aa -r 87ac4519efd8 tcl-8.5.2.1/generic/tclPosixStr.c --- a/tcl-8.5.2.1/generic/tclPosixStr.c Tue Oct 18 17:03:03 2011 +0200 +++ b/tcl-8.5.2.1/generic/tclPosixStr.c Tue Oct 18 17:09:41 2011 +0200 @@ -344,7 +344,7 @@ case EPERM: return "EPERM"; #endif #if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT)) - case EPFNOSUPPORT: return "EPFNOSUPPORT"; + #endif #ifdef EPIPE case EPIPE: return "EPIPE"; @@ -404,7 +404,7 @@ case ESHUTDOWN: return "ESHUTDOWN"; #endif #ifdef ESOCKTNOSUPPORT - case ESOCKTNOSUPPORT: return "ESOCKTNOSUPPORT"; + #endif #ifdef ESPIPE case ESPIPE: return "ESPIPE"; @@ -792,7 +792,7 @@ case EPERM: return "not owner"; #endif #if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT)) - case EPFNOSUPPORT: return "protocol family not supported"; + #endif #ifdef EPIPE case EPIPE: return "broken pipe"; @@ -852,7 +852,7 @@ case ESHUTDOWN: return "can't send afer socket shutdown"; #endif #ifdef ESOCKTNOSUPPORT - case ESOCKTNOSUPPORT: return "socket type not supported"; + #endif #ifdef ESPIPE case ESPIPE: return "invalid seek"; diff -r 97fbe6d3b5aa -r 87ac4519efd8 tcl-8.5.2.1/win/makefile.vc --- a/tcl-8.5.2.1/win/makefile.vc Tue Oct 18 17:03:03 2011 +0200 +++ b/tcl-8.5.2.1/win/makefile.vc Tue Oct 18 17:09:41 2011 +0200 @@ -448,7 +448,7 @@ #--------------------------------------------------------------------- !if $(DEBUG) -ldebug = -debug:full -debugtype:cv +ldebug = -debugtype:cv !else ldebug = -release -opt:ref -opt:icf,3 !endif diff -r 97fbe6d3b5aa -r 87ac4519efd8 tk-8.5.2.0/win/makefile.vc --- a/tk-8.5.2.0/win/makefile.vc Tue Oct 18 17:03:03 2011 +0200 +++ b/tk-8.5.2.0/win/makefile.vc Tue Oct 18 17:09:41 2011 +0200 @@ -472,7 +472,7 @@ #--------------------------------------------------------------------- !if $(DEBUG) -ldebug = -debug:full -debugtype:cv +ldebug = -debugtype:cv !else ldebug = -release -opt:ref -opt:icf,3 !endif }}} |
| Line 40: | Line 119: |
| Tools\buildbot\external.bat }}} * Get openssl 1.0.0d {{{ $ set PATH=%PATH%;C:\cygwin\bin # pour perl $ cd openssl-1.0.0d $ perl Configure enable-camellia --openssldir=D:/NotBackedUp/support/openssl-1.0.0d VC-WIN32 $ ms\do_ms.bat # eventuellement .\ms\do_nasm.bat avec http://nasm.sf.net $ nmake -f ms\nt.mak $ nmake -f ms\ntdll.mak $ nmake -f ms\ntdll.mak test $ nmake -f ms\ntdll.mak install see PCbuild\build_ssl.py pour passage en 64 bits |
For 32 bits: $ Tools\buildbot\external.bat For 64 bits: $ Tools\buildbot\external-amd64.bat }}} * Get openssl 1.0.0e '''You need perl to compile openssl''' {{{ set PATH=%PATH%;C:\Perl\bin cd openssl-1.0.0e For 32 bits: perl Configure --openssldir=D:\NotBackedUp\support\openssl-1.0.0e\ enable-camellia disable-idea VC-WIN32 ms\do_ms.bat # possibly .\ms\do_nasm.bat with http://nasm.sf.net nmake -f ms\nt.mak nmake -f ms\ntdll.mak For 64 bits: perl Configure --openssldir=D:\NotBackedUp\support\openssl-1.0.0e\ enable-camellia disable-idea VC-WIN64A ms\do_win64a.bat nmake -f ms\nt.mak nmake -f ms\ntdll.mak ## $ nmake -f ms\ntdll.mak test |
| Line 60: | Line 152: |
| {{{ TODO: automatisation vcbuild /useenv pcbuild.sln /rebuild "Release|Win32" }}} * Modify Python-2.7.2\PCbuild\_bsddb.vcxproj for each source line, from: {{{ <ClCompile Include="crypto\aes_method.c" /> }}} to {{{ <ClCompile Include="$(bsddbDir)\..\crypto\aes_method.c" /> }}} * Modify Python-2.7.2\PCbuild\_ssl.vcxproj and Python-2.7.2\PCbuild\_hashlib.vcxproj - remove each PreBuildEvent section * Modify Python-2.7.2/PCbuild/bdist_wininst.vcproj {{{ |
* Modify Python 2.7.2 so that it will compile with Visual Studio 2010: {{{ diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Lib/distutils/command/build_ext.py --- a/Python-2.7.2/Lib/distutils/command/build_ext.py Tue Oct 18 17:09:41 2011 +0200 +++ b/Python-2.7.2/Lib/distutils/command/build_ext.py Tue Oct 18 17:15:40 2011 +0200 @@ -193,7 +193,7 @@ # Append the source distribution include and library directories, # this allows distutils on windows to work in the source tree self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC')) - if MSVC_VERSION == 9: + if MSVC_VERSION in (9, 10): # Use the .lib files for the correct architecture if self.plat_name == 'win32': suffix = '' diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Lib/distutils/msvc9compiler.py --- a/Python-2.7.2/Lib/distutils/msvc9compiler.py Tue Oct 18 17:09:41 2011 +0200 +++ b/Python-2.7.2/Lib/distutils/msvc9compiler.py Tue Oct 18 17:15:40 2011 +0200 @@ -240,7 +240,7 @@ log.debug("Unable to find productdir in registry") if not productdir or not os.path.isdir(productdir): - toolskey = "VS%0.f0COMNTOOLS" % version + toolskey = "VS100COMNTOOLS" toolsdir = os.environ.get(toolskey, None) if toolsdir and os.path.isdir(toolsdir): @@ -645,6 +645,7 @@ # (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx) # Ask the linker to generate the manifest in the temp dir, so # we can embed it later. + ld_args.append('/MANIFEST') temp_manifest = os.path.join( build_temp, os.path.basename(output_filename) + ".manifest") diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/PCbuild/bdist_wininst.vcproj --- a/Python-2.7.2/PCbuild/bdist_wininst.vcproj Tue Oct 18 17:09:41 2011 +0200 +++ b/Python-2.7.2/PCbuild/bdist_wininst.vcproj Tue Oct 18 17:15:40 2011 +0200 |
| Line 107: | Line 218: |
| }}} * Open Python-2.7.2\PCbuild\pcbuild.sln with Visual Studio (automatic conversion) * Change to Release * Choose in menu "View" => "Property Manager" * open project _bsddb > Release | Win32 > pyd > pyproject > User macros * change value of opensslDir, from "$(externalsDir)\openssl-0.9.8d" to "$(externalsDir)\openssl-1.0.0d" * Change properties in project tkinter > Linker > Input > Additional Dependencies > edit: remove $(tcltkLib) and add $(tcltkDir)\lib\tcl85g.lib then $(tcltkDir)\lib\tk85g.lib * Build _bsddb, bz2, _tkinter, _ssl, _sqlite3, _hashlib * Build solution * copy Python-2.7.2/PC/pyconfig.h Python-2.7.2/pyconfig.h * modify Python-2.7.2/Lib/distutils/command/build_ext.py: {{{ @@ -193,7 +193,7 @@ # Append the source distribution include and library directories, # this allows distutils on windows to work in the source tree self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC')) - if MSVC_VERSION == 9: + if MSVC_VERSION in (9, 10): # Use the .lib files for the correct architecture if self.plat_name == 'win32': suffix = '' }}} * Modify Lib\distutils\msvc9compiler.py - replace line 243 with this: {{{ toolskey = "VS100COMNTOOLS" }}} and add after line 647: {{{ ld_args.append('/MANIFEST') }}} * Test python: {{{ cd PCbuild; rt.bat }}} == Create installer == * get http://sourceforge.net/projects/pywin32/files/pywin32/Build216/pywin32-216.zip/download * unzip pywin32-216.zip {{{ cd pywin32-216 copy ..\Python-2.7.2\PCbuild\python27.lib . }}} * modify setup.py: {{{ $ diff -u setup.py.old setup.py --- setup.py.old 2011-10-12 14:21:45.639176900 +0200 +++ setup.py 2011-10-12 14:33:33.350690900 +0200 @@ -950,6 +950,7 @@ if self.debug: largs.append("/DEBUG") temp_manifest = os.path.join(build_temp, os.path.basename(dll) + ".manifest") + largs.append('/MANIFEST') largs.append('/MANIFESTFILE:' + temp_manifest) largs.append('/PDB:None') largs.append("/OUT:" + dll) @@ -1049,18 +1050,19 @@ plat_dir = "x86" # Find the redist directory. vckey = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, - r"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC", + r"SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC", 0, access) val, val_typ = _winreg.QueryValueEx(vckey, "ProductDir") - mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC90.MFC") + mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC100.MFC") if not os.path.isdir(mfc_dir): raise RuntimeError("Can't find the redist dir at %r" % (mfc_dir)) - files = "mfc90.dll mfc90u.dll mfcm90.dll mfcm90u.dll Microsoft.VC90.MFC.m anifest".split() + files = "mfc100.dll mfc100u.dll mfcm100.dll mfcm100u.dll".split() for f in files: self.copy_file( os.path.join(mfc_dir, f), target_dir) except (EnvironmentError, RuntimeError), exc: - print "Can't find an installed VC for the MFC DLLs:", exc + #print "Can't find an installed VC for the MFC DLLs:", exc + raise exc def build_exefile(self, ext): }}} * modify pythonwin/Scintilla/win32/scintilla.mak and pythonwin/Scintilla/win32/scintilla_vc6.mak : remove -OPT:NOWIN98 * compile {{{ ..\Python-2.7.2\PCbuild\python.exe setup.py build ..\Python-2.7.2\PCbuild\python.exe setup.py install }}} * Build extras and Python doc {{{ cd Python-2.7.2\PC nmake icons.mak ### with cygwin cd Python-2.7.2/Doc ./make.bat checkout ./make.bat htmlhelp }}} * build MSI package {{{ cd Python-2.7.2\Tools\msi }}} {{{ TODO on bugs.pyhton.org # http://bugs.python.org/issue6807 # + http://hg.python.org/cpython/rev/78e40316e023 # + policy MSM no longer exists }}} {{{ $ diff -u msi.py.old msi.py --- msi.py.old 2011-10-12 14:45:29.713434800 +0200 +++ msi.py 2011-10-12 17:15:27.574189800 +0200 |
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Tools/msi/msi.py --- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 18 17:09:41 2011 +0200 +++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 18 17:15:40 2011 +0200 |
| Line 251: | Line 230: |
| @@ -860,18 +860,18 @@ | @@ -179,8 +179,16 @@ # Determine the target architecture dll_path = os.path.join(srcdir, PCBUILD, dll_file) msilib.set_arch_from_file(dll_path) -if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): - raise SystemError, "msisupport.dll for incorrect architecture" +have_msisupport = os.path.exists("msisupport.dll") +if have_msisupport: + try: + if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"): + raise SystemError("msisupport.dll for incorrect architecture") + except: + print("WARNING: Architecture check for msisupport.dll failed.") +else: + print("WARNING: msisupport.dll not found. Architecture check for msisupport.dll skipped.") + if msilib.Win64: upgrade_code = upgrade_code_64 # Bump the last digit of the code by one, so that 32-bit and 64-bit @@ -852,18 +860,18 @@ |
| Line 254: | Line 252: |
| Line 262: | Line 260: |
| - dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC90.C RT" % arch) + dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100 .CRT" % arch) |
- dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC90.CRT" % arch) + dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch) |
| Line 277: | Line 273: |
| @@ -889,9 +889,9 @@ | @@ -881,9 +889,9 @@ |
| Line 287: | Line 283: |
| out.write("\nThis copy of Python includes a copy of %s, which is licensed under t he following terms:\n\n" % name) |
out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name) |
| Line 291: | Line 286: |
| @@ -947,20 +947,20 @@ | @@ -939,20 +947,20 @@ |
| Line 294: | Line 289: |
| Line 312: | Line 307: |
| #open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../m svcr")) |
#open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr")) |
| Line 317: | Line 311: |
| Line 319: | Line 313: |
| @@ -1333,9 +1333,9 @@ | @@ -1325,9 +1333,9 @@ |
| Line 323: | Line 317: |
| - modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_9_0_Microsoft_VC90_CRT_x86_x64.m sm"] + modules = ["Microsoft_VC100_CRT_x86_x64.msm", "policy_10_0_Microsoft_VC100_CRT_x86_x6 4.msm"] |
- modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"] + modules = ["Microsoft_VC100_CRT_x64.msm",] |
| Line 329: | Line 321: |
| + modules = ["Microsoft_VC100_CRT_x86.msm",] ###"policy_10_0_Microsoft_VC100_CRT_x86.ms m"] |
+ modules = ["Microsoft_VC100_CRT_x86.msm",] |
| Line 334: | Line 325: |
| }}} {{{ $ diff -u msilib.py.old msilib.py --- msilib.py.old 2011-10-12 16:23:06.790189800 +0200 +++ msilib.py 2011-10-12 16:56:32.973189800 +0200 |
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Tools/msi/msilib.py --- a/Python-2.7.2/Tools/msi/msilib.py Tue Oct 18 17:09:41 2011 +0200 +++ b/Python-2.7.2/Tools/msi/msilib.py Tue Oct 18 17:15:40 2011 +0200 |
| Line 346: | Line 334: |
| Line 357: | Line 345: |
| Line 368: | Line 356: |
| Line 375: | Line 363: |
| - for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir") , - (r"Software\Microsoft\VisualStudio\8.0\Setup\VS", "VS7CommonBinDir") , - (r"Software\Microsoft\VisualStudio\9.0\Setup\VS", "VS7CommonBinDir") , |
- for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir"), - (r"Software\Microsoft\VisualStudio\8.0\Setup\VS", "VS7CommonBinDir"), - (r"Software\Microsoft\VisualStudio\9.0\Setup\VS", "VS7CommonBinDir"), |
| Line 414: | Line 399: |
| }}} For 64 bits - apply additional patch: {{{ diff -r 85c73eff95c1 Python-2.7.2/Tools/msi/msi.py --- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 16:29:23 2011 +0200 +++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 17:41:17 2011 +0200 @@ -26,7 +26,7 @@ # Is Tcl available at all? have_tcl = True # path to PCbuild directory -PCBUILD="PCbuild" +PCBUILD="PCbuild\\amd64" # msvcrt version MSVCR = "100" # Name of certificate in default store to sign MSI with @@ -863,7 +863,7 @@ def extract_msvcr100(): # Find the redistributable files if msilib.Win64: - arch = "amd64" + arch = "x64" else: arch = "x86" dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch) }}} * Open Python-2.7.2\PCbuild\pcbuild.sln with Visual Studio (automatic conversion) * Close the solution * Modify Python-2.7.2\PCbuild\_bsddb.vcxproj for each source line, from: {{{ <ClCompile Include="crypto\aes_method.c" /> }}} to {{{ <ClCompile Include="$(bsddbDir)\..\crypto\aes_method.c" /> }}} * Modify Python-2.7.2\PCbuild\_ssl.vcxproj and Python-2.7.2\PCbuild\_hashlib.vcxproj - remove each PreBuildEvent section (could not get build_ssl.py to work, prefered manual compilation) * Open Python-2.7.2\PCbuild\pcbuild.sln with Visual Studio * Change to Release (for 64 bits: "Release | x64") * Choose in menu "View" => "Property Manager" * open project _bsddb > "Release | Win32" > pyd > pyproject > User macros (for 64 bits: "Release | x64") * change value of opensslDir, from "$(externalsDir)\openssl-0.9.8d" to "$(externalsDir)\openssl-1.0.0d" * Change properties in project tkinter > Linker > Input > Additional Dependencies > edit: For 32 bits: remove $(tcltkLib) and add $(tcltkDir)\lib\tcl85g.lib;$(tcltkDir)\lib\tk85g.lib; For 64 bits: remove $(tcltk64Lib) and add $(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib; * Build solution {{{ Use either the UI or following commands: For 32 bits: msbuild PCbuild\pcbuild.sln /p:Configuration="Release" /p:Platform="Win32" For 64 bits: msbuild PCbuild\pcbuild.sln /p:Configuration="Release" /p:Platform="x64" }}} * Build project bdist_wininst * copy Python-2.7.2/PC/pyconfig.h to Python-2.7.2/pyconfig.h (necessary otherwise distutils complains that it can't find the file when compiling packages) * Test python: {{{ cd PCbuild; For 32 bits: rt.bat -q -uall -rwW For 64 bits: rt.bat -q -x64 -uall -rw }}} Note: currently the tests will lock on test_asyncore: may be related to [[issue 10469|http://bugs.python.org/issue10469]]. == Create installer == * get http://sourceforge.net/projects/pywin32/files/pywin32/Build216/pywin32-216.zip/download * unzip pywin32-216.zip {{{ cd pywin32-216 }}} * modify files so that it will compile with visual Studio 2010: {{{ diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/pythonwin/Scintilla/win32/scintilla.mak --- a/pywin32-216/pythonwin/Scintilla/win32/scintilla.mak Tue Oct 18 17:21:49 2011 +0200 +++ b/pywin32-216/pythonwin/Scintilla/win32/scintilla.mak Tue Oct 18 17:24:37 2011 +0200 @@ -40,7 +40,7 @@ CXXDEBUG=-Od -MTd -DDEBUG CXXNDEBUG=-O1 -MT -DNDEBUG -GL NAME=-Fo -LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG -DEBUG +LDFLAGS=-OPT:REF -LTCG -DEBUG LDDEBUG= LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB NOLOGO=-nologo diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak --- a/pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak Tue Oct 18 17:21:49 2011 +0200 +++ b/pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak Tue Oct 18 17:24:37 2011 +0200 @@ -42,7 +42,7 @@ CXXNDEBUG=-O1 -MT -DNDEBUG NAME=-Fo # If you have problems with lexers being linked, try removing -OPT:REF and replacing with -OPT:NOREF -LDFLAGS=-OPT:NOWIN98 -OPT:REF +LDFLAGS=-OPT:REF LDDEBUG= LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB NOLOGO=-nologo diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/setup.py --- a/pywin32-216/setup.py Tue Oct 18 17:21:49 2011 +0200 +++ b/pywin32-216/setup.py Tue Oct 18 17:24:37 2011 +0200 @@ -950,6 +950,7 @@ if self.debug: largs.append("/DEBUG") temp_manifest = os.path.join(build_temp, os.path.basename(dll) + ".manifest") + largs.append('/MANIFEST') largs.append('/MANIFESTFILE:' + temp_manifest) largs.append('/PDB:None') largs.append("/OUT:" + dll) @@ -1049,13 +1050,13 @@ plat_dir = "x86" # Find the redist directory. vckey = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, - r"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC", + r"SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC", 0, access) val, val_typ = _winreg.QueryValueEx(vckey, "ProductDir") - mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC90.MFC") + mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC100.MFC") if not os.path.isdir(mfc_dir): raise RuntimeError("Can't find the redist dir at %r" % (mfc_dir)) - files = "mfc90.dll mfc90u.dll mfcm90.dll mfcm90u.dll Microsoft.VC90.MFC.manifest".split() + files = "mfc100.dll mfc100u.dll mfcm100.dll mfcm100u.dll".split() for f in files: self.copy_file( os.path.join(mfc_dir, f), target_dir) }}} * compile {{{ For 32 bits: ..\Python-2.7.2\PCbuild\python.exe setup.py build ..\Python-2.7.2\PCbuild\python.exe setup.py install For 64 bits: ..\Python-2.7.2\PCbuild\amd64\python.exe setup.py build ..\Python-2.7.2\PCbuild\amd64\python.exe setup.py install }}} * Build extras and Python doc {{{ cd Python-2.7.2\PC For 64 bits - modify icons.mak: @@ -1,5 +1,5 @@ python_icon.exe: py.res empty.obj - link /out:python_icon.exe /machine:x86 /subsystem:windows py.res empty.obj + link /out:python_icon.exe /machine:x64 /subsystem:windows py.res empty.obj nmake icons.mak cd Python-2.7.2/Doc SET HTMLHELP=hhc SET PYTHON=..\PCbuild\amd64\python make.bat checkout make.bat htmlhelp SET PYTHON= }}} * build MSI package {{{ cd Python-2.7.2\Tools\msi |
|
| Line 418: | Line 591: |
| For 32 bits: | |
| Line 419: | Line 593: |
| }}} * Install the generated .msi file (should be C:\Python27) |
For 64 bits: Merging Microsoft.VC100.CRT in the package will fail for the moment, so you need to apply the following patch to msi.py: diff -r 85c73eff95c1 Python-2.7.2/Tools/msi/msi.py --- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 16:29:23 2011 +0200 +++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 17:41:17 2011 +0200 @@ -1342,29 +1342,29 @@ def merge(msi, feature, rootdir, modules): cab_and_filecount = [] - # Step 1: Merge databases, extract cabfiles - m = msilib.MakeMerge2() - m.OpenLog("merge.log") - m.OpenDatabase(msi) - for module in modules: - print module - m.OpenModule(module,0) - m.Merge(feature, rootdir) - print "Errors:" - for e in m.Errors: - print e.Type, e.ModuleTable, e.DatabaseTable - print " Modkeys:", - for s in e.ModuleKeys: print s, - print " DBKeys:", - for s in e.DatabaseKeys: print s, - cabname = tempfile.mktemp(suffix=".cab") - m.ExtractCAB(cabname) - cab_and_filecount.append((cabname, len(m.ModuleFiles))) - m.CloseModule() - m.CloseDatabase(True) - m.CloseLog() + # # Step 1: Merge databases, extract cabfiles + # m = msilib.MakeMerge2() + # m.OpenLog("merge.log") + # m.OpenDatabase(msi) + # for module in modules: + # print module + # m.OpenModule(module,0) + # m.Merge(feature, rootdir) + # print "Errors:" + # for e in m.Errors: + # print e.Type, e.ModuleTable, e.DatabaseTable + # print " Modkeys:", + # for s in e.ModuleKeys: print s, + # print " DBKeys:", + # for s in e.DatabaseKeys: print s, + # cabname = tempfile.mktemp(suffix=".cab") + # m.ExtractCAB(cabname) + # cab_and_filecount.append((cabname, len(m.ModuleFiles))) + # m.CloseModule() + # m.CloseDatabase(True) + # m.CloseLog() # Step 2: Add CAB files i = msilib.MakeInstaller() Then call: ..\..\PCbuild\amd64\python.exe msi.py }}} |
Compiling Python with Visual Studio 2010
This is a draft related to http://bugs.python.org/issue13210.
Issues
List of issues related to Visual Studio 2010:
* issue 13210: parent issue
* issue 10469: test_asyncore blocks forever
* issue 4431: manifest handling
* issue7833: patch to avoid the use of manifests
* issue6807: problem with msi for installer creation
* issue2286: crash on test_marshal
Prepare environment
* grab Python 2.7.2 sources from python.org
* Define compilation environment:
For 32 bits: "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat" For 64 bits: "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
It is necessary to have svn in the PATH
Compile additional libraries
* Download the dependencies:
cd Python-2.7.2 Tools\buildbot\external-common.bat
* Correct the dependencies for VS 2010:
diff -r 97fbe6d3b5aa -r 87ac4519efd8 tcl-8.5.2.1/generic/tclPosixStr.c
--- a/tcl-8.5.2.1/generic/tclPosixStr.c Tue Oct 18 17:03:03 2011 +0200
+++ b/tcl-8.5.2.1/generic/tclPosixStr.c Tue Oct 18 17:09:41 2011 +0200
@@ -344,7 +344,7 @@
case EPERM: return "EPERM";
#endif
#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
- case EPFNOSUPPORT: return "EPFNOSUPPORT";
+
#endif
#ifdef EPIPE
case EPIPE: return "EPIPE";
@@ -404,7 +404,7 @@
case ESHUTDOWN: return "ESHUTDOWN";
#endif
#ifdef ESOCKTNOSUPPORT
- case ESOCKTNOSUPPORT: return "ESOCKTNOSUPPORT";
+
#endif
#ifdef ESPIPE
case ESPIPE: return "ESPIPE";
@@ -792,7 +792,7 @@
case EPERM: return "not owner";
#endif
#if defined(EPFNOSUPPORT) && (!defined(ENOLCK) || (ENOLCK != EPFNOSUPPORT))
- case EPFNOSUPPORT: return "protocol family not supported";
+
#endif
#ifdef EPIPE
case EPIPE: return "broken pipe";
@@ -852,7 +852,7 @@
case ESHUTDOWN: return "can't send afer socket shutdown";
#endif
#ifdef ESOCKTNOSUPPORT
- case ESOCKTNOSUPPORT: return "socket type not supported";
+
#endif
#ifdef ESPIPE
case ESPIPE: return "invalid seek";
diff -r 97fbe6d3b5aa -r 87ac4519efd8 tcl-8.5.2.1/win/makefile.vc
--- a/tcl-8.5.2.1/win/makefile.vc Tue Oct 18 17:03:03 2011 +0200
+++ b/tcl-8.5.2.1/win/makefile.vc Tue Oct 18 17:09:41 2011 +0200
@@ -448,7 +448,7 @@
#---------------------------------------------------------------------
!if $(DEBUG)
-ldebug = -debug:full -debugtype:cv
+ldebug = -debugtype:cv
!else
ldebug = -release -opt:ref -opt:icf,3
!endif
diff -r 97fbe6d3b5aa -r 87ac4519efd8 tk-8.5.2.0/win/makefile.vc
--- a/tk-8.5.2.0/win/makefile.vc Tue Oct 18 17:03:03 2011 +0200
+++ b/tk-8.5.2.0/win/makefile.vc Tue Oct 18 17:09:41 2011 +0200
@@ -472,7 +472,7 @@
#---------------------------------------------------------------------
!if $(DEBUG)
-ldebug = -debug:full -debugtype:cv
+ldebug = -debugtype:cv
!else
ldebug = -release -opt:ref -opt:icf,3
!endif* Compile the dependencies:
For 32 bits: $ Tools\buildbot\external.bat For 64 bits: $ Tools\buildbot\external-amd64.bat
* Get openssl 1.0.0e
You need perl to compile openssl
set PATH=%PATH%;C:\Perl\bin cd openssl-1.0.0e For 32 bits: perl Configure --openssldir=D:\NotBackedUp\support\openssl-1.0.0e\ enable-camellia disable-idea VC-WIN32 ms\do_ms.bat # possibly .\ms\do_nasm.bat with http://nasm.sf.net nmake -f ms\nt.mak nmake -f ms\ntdll.mak For 64 bits: perl Configure --openssldir=D:\NotBackedUp\support\openssl-1.0.0e\ enable-camellia disable-idea VC-WIN64A ms\do_win64a.bat nmake -f ms\nt.mak nmake -f ms\ntdll.mak ## $ nmake -f ms\ntdll.mak test
Compile Python
* Modify Python 2.7.2 so that it will compile with Visual Studio 2010:
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Lib/distutils/command/build_ext.py
--- a/Python-2.7.2/Lib/distutils/command/build_ext.py Tue Oct 18 17:09:41 2011 +0200
+++ b/Python-2.7.2/Lib/distutils/command/build_ext.py Tue Oct 18 17:15:40 2011 +0200
@@ -193,7 +193,7 @@
# Append the source distribution include and library directories,
# this allows distutils on windows to work in the source tree
self.include_dirs.append(os.path.join(sys.exec_prefix, 'PC'))
- if MSVC_VERSION == 9:
+ if MSVC_VERSION in (9, 10):
# Use the .lib files for the correct architecture
if self.plat_name == 'win32':
suffix = ''
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Lib/distutils/msvc9compiler.py
--- a/Python-2.7.2/Lib/distutils/msvc9compiler.py Tue Oct 18 17:09:41 2011 +0200
+++ b/Python-2.7.2/Lib/distutils/msvc9compiler.py Tue Oct 18 17:15:40 2011 +0200
@@ -240,7 +240,7 @@
log.debug("Unable to find productdir in registry")
if not productdir or not os.path.isdir(productdir):
- toolskey = "VS%0.f0COMNTOOLS" % version
+ toolskey = "VS100COMNTOOLS"
toolsdir = os.environ.get(toolskey, None)
if toolsdir and os.path.isdir(toolsdir):
@@ -645,6 +645,7 @@
# (currently at http://msdn2.microsoft.com/en-us/library/ms235591(VS.80).aspx)
# Ask the linker to generate the manifest in the temp dir, so
# we can embed it later.
+ ld_args.append('/MANIFEST')
temp_manifest = os.path.join(
build_temp,
os.path.basename(output_filename) + ".manifest")
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/PCbuild/bdist_wininst.vcproj
--- a/Python-2.7.2/PCbuild/bdist_wininst.vcproj Tue Oct 18 17:09:41 2011 +0200
+++ b/Python-2.7.2/PCbuild/bdist_wininst.vcproj Tue Oct 18 17:15:40 2011 +0200
@@ -75,11 +75,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
- OutputFile="..\lib\distutils\command\wininst-9.0.exe"
+ OutputFile="..\lib\distutils\command\wininst-10.0.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0.pdb"
+ ProgramDatabaseFile="..\lib\distutils\command\wininst-10.0.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
@@ -165,11 +165,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib imagehlp.lib"
- OutputFile="..\lib\distutils\command\wininst-9.0-amd64.exe"
+ OutputFile="..\lib\distutils\command\wininst-10.0-amd64.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC"
- ProgramDatabaseFile="..\lib\distutils\command\wininst-9.0-amd64.pdb"
+ ProgramDatabaseFile="..\lib\distutils\command\wininst-10.0-amd64.pdb"
SubSystem="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Tools/msi/msi.py
--- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 18 17:09:41 2011 +0200
+++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 18 17:15:40 2011 +0200
@@ -28,7 +28,7 @@
# path to PCbuild directory
PCBUILD="PCbuild"
# msvcrt version
-MSVCR = "90"
+MSVCR = "100"
# Name of certificate in default store to sign MSI with
certname = None
# Make a zip file containing the PDB files for this build?
@@ -179,8 +179,16 @@
# Determine the target architecture
dll_path = os.path.join(srcdir, PCBUILD, dll_file)
msilib.set_arch_from_file(dll_path)
-if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
- raise SystemError, "msisupport.dll for incorrect architecture"
+have_msisupport = os.path.exists("msisupport.dll")
+if have_msisupport:
+ try:
+ if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
+ raise SystemError("msisupport.dll for incorrect architecture")
+ except:
+ print("WARNING: Architecture check for msisupport.dll failed.")
+else:
+ print("WARNING: msisupport.dll not found. Architecture check for msisupport.dll skipped.")
+
if msilib.Win64:
upgrade_code = upgrade_code_64
# Bump the last digit of the code by one, so that 32-bit and 64-bit
@@ -852,18 +860,18 @@
"Python test suite (Lib/test/)", 11,
parent = default_feature, attributes=2|8)
-def extract_msvcr90():
+def extract_msvcr100():
# Find the redistributable files
if msilib.Win64:
arch = "amd64"
else:
arch = "x86"
- dir = os.path.join(os.environ['VS90COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC90.CRT" % arch)
+ dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch)
- result = []
+ result = [None,]
installer = msilib.MakeInstaller()
- # omit msvcm90 and msvcp90, as they aren't really needed
- files = ["Microsoft.VC90.CRT.manifest", "msvcr90.dll"]
+ # omit msvcm100 and msvcp100, as they aren't really needed
+ files = ["msvcr100.dll",]
for f in files:
path = os.path.join(dir, f)
kw = {'src':path}
@@ -881,9 +889,9 @@
for name, pat, file in (("bzip2","bzip2-*", "LICENSE"),
("Berkeley DB", "db-*", "LICENSE"),
("openssl", "openssl-*", "LICENSE"),
- ("Tcl", "tcl8*", "license.terms"),
- ("Tk", "tk8*", "license.terms"),
- ("Tix", "tix-*", "license.terms")):
+ ("Tcl", "tcl-8*", "license.terms"),
+ ("Tk", "tk-8*", "license.terms"),):
+ # ("Tix", "tix-*", "license.terms")):
out.write("\nThis copy of Python includes a copy of %s, which is licensed under the following terms:\n\n" % name)
dirs = glob.glob(srcdir+"/../"+pat)
if not dirs:
@@ -939,20 +947,20 @@
language=installer.FileVersion(pydllsrc, 1))
DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs")
- # msvcr90.dll: Need to place the DLL and the manifest into the root directory,
+ # msvcr100.dll: Need to place the DLL and the manifest into the root directory,
# plus another copy of the manifest in the DLLs directory, with the manifest
# pointing to the root directory
- root.start_component("msvcr90", feature=private_crt)
+ root.start_component("msvcr100", feature=private_crt)
# Results are ID,keyword pairs
- manifest, crtdll = extract_msvcr90()
- root.add_file(manifest[0], **manifest[1])
+ manifest, crtdll = extract_msvcr100()
+ # root.add_file(manifest[0], **manifest[1])
root.add_file(crtdll[0], **crtdll[1])
# Copy the manifest
# Actually, don't do that anymore - no DLL in DLLs should have a manifest
- # dependency on msvcr90.dll anymore, so this should not be necessary
+ # dependency on msvcr100.dll anymore, so this should not be necessary
#manifest_dlls = manifest[0]+".root"
#open(manifest_dlls, "w").write(open(manifest[1]['src']).read().replace("msvcr","../msvcr"))
- #DLLs.start_component("msvcr90_dlls", feature=private_crt)
+ #DLLs.start_component("msvcr100_dlls", feature=private_crt)
#DLLs.add_file(manifest[0], src=os.path.abspath(manifest_dlls))
# Now start the main component for the DLLs directory;
@@ -1325,9 +1333,9 @@
# Merge CRT into MSI file. This requires the database to be closed.
mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules")
if msilib.Win64:
- modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"]
+ modules = ["Microsoft_VC100_CRT_x64.msm",]
else:
- modules = ["Microsoft_VC90_CRT_x86.msm","policy_9_0_Microsoft_VC90_CRT_x86.msm"]
+ modules = ["Microsoft_VC100_CRT_x86.msm",]
for i, n in enumerate(modules):
modules[i] = os.path.join(mod_dir, n)
diff -r 87ac4519efd8 -r 0e7993d51350 Python-2.7.2/Tools/msi/msilib.py
--- a/Python-2.7.2/Tools/msi/msilib.py Tue Oct 18 17:09:41 2011 +0200
+++ b/Python-2.7.2/Tools/msi/msilib.py Tue Oct 18 17:15:40 2011 +0200
@@ -5,7 +5,7 @@
import win32com.client
import pythoncom, pywintypes
from win32com.client import constants
-import re, string, os, sets, glob, subprocess, sys, _winreg, struct
+import re, string, os, sets, glob, subprocess, sys, _winreg, struct, _msi
try:
basestring
@@ -350,7 +350,7 @@
class CAB:
def __init__(self, name):
self.name = name
- self.file = open(name+".txt", "wt")
+ self.files = []
self.filenames = sets.Set()
self.index = 0
@@ -369,51 +369,18 @@
if not logical:
logical = self.gen_id(dir, file)
self.index += 1
- if full.find(" ")!=-1:
- print >>self.file, '"%s" %s' % (full, logical)
- else:
- print >>self.file, '%s %s' % (full, logical)
+ self.files.append((full, logical))
return self.index, logical
def commit(self, db):
- self.file.close()
try:
os.unlink(self.name+".cab")
except OSError:
pass
- for k, v in [(r"Software\Microsoft\VisualStudio\7.1\Setup\VS", "VS7CommonBinDir"),
- (r"Software\Microsoft\VisualStudio\8.0\Setup\VS", "VS7CommonBinDir"),
- (r"Software\Microsoft\VisualStudio\9.0\Setup\VS", "VS7CommonBinDir"),
- (r"Software\Microsoft\Win32SDK\Directories", "Install Dir"),
- ]:
- try:
- key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, k)
- dir = _winreg.QueryValueEx(key, v)[0]
- _winreg.CloseKey(key)
- except (WindowsError, IndexError):
- continue
- cabarc = os.path.join(dir, r"Bin", "cabarc.exe")
- if not os.path.exists(cabarc):
- continue
- break
- else:
- print "WARNING: cabarc.exe not found in registry"
- cabarc = "cabarc.exe"
- cmd = r'"%s" -m lzx:21 n %s.cab @%s.txt' % (cabarc, self.name, self.name)
- p = subprocess.Popen(cmd, shell=True, stdin=subprocess.PIPE,
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- for line in p.stdout:
- if line.startswith(" -- adding "):
- sys.stdout.write(".")
- else:
- sys.stdout.write(line)
- sys.stdout.flush()
- if not os.path.exists(self.name+".cab"):
- raise IOError, "cabarc failed"
+ _msi.FCICreate(self.name+".cab", self.files)
add_data(db, "Media",
[(1, self.index, None, "#"+self.name, None, None)])
add_stream(db, self.name, self.name+".cab")
- os.unlink(self.name+".txt")
os.unlink(self.name+".cab")
db.Commit()For 64 bits - apply additional patch:
diff -r 85c73eff95c1 Python-2.7.2/Tools/msi/msi.py
--- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 16:29:23 2011 +0200
+++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 17:41:17 2011 +0200
@@ -26,7 +26,7 @@
# Is Tcl available at all?
have_tcl = True
# path to PCbuild directory
-PCBUILD="PCbuild"
+PCBUILD="PCbuild\\amd64"
# msvcrt version
MSVCR = "100"
# Name of certificate in default store to sign MSI with
@@ -863,7 +863,7 @@
def extract_msvcr100():
# Find the redistributable files
if msilib.Win64:
- arch = "amd64"
+ arch = "x64"
else:
arch = "x86"
dir = os.path.join(os.environ['VS100COMNTOOLS'], r"..\..\VC\redist\%s\Microsoft.VC100.CRT" % arch)* Open Python-2.7.2\PCbuild\pcbuild.sln with Visual Studio (automatic conversion)
* Close the solution
* Modify Python-2.7.2\PCbuild\_bsddb.vcxproj for each source line, from:
<ClCompile Include="crypto\aes_method.c" />
to
<ClCompile Include="$(bsddbDir)\..\crypto\aes_method.c" />
* Modify Python-2.7.2\PCbuild\_ssl.vcxproj and Python-2.7.2\PCbuild\_hashlib.vcxproj - remove each PreBuildEvent section (could not get build_ssl.py to work, prefered manual compilation)
* Open Python-2.7.2\PCbuild\pcbuild.sln with Visual Studio
* Change to Release (for 64 bits: "Release | x64")
* Choose in menu "View" => "Property Manager"
* open project _bsddb > "Release | Win32" > pyd > pyproject > User macros (for 64 bits: "Release | x64")
* change value of opensslDir, from "$(externalsDir)\openssl-0.9.8d" to "$(externalsDir)\openssl-1.0.0d"
* Change properties in project tkinter > Linker > Input > Additional Dependencies > edit:
For 32 bits: remove $(tcltkLib) and add $(tcltkDir)\lib\tcl85g.lib;$(tcltkDir)\lib\tk85g.lib;
For 64 bits: remove $(tcltk64Lib) and add $(tcltk64Dir)\lib\tcl85g.lib;$(tcltk64Dir)\lib\tk85g.lib;
* Build solution
Use either the UI or following commands: For 32 bits: msbuild PCbuild\pcbuild.sln /p:Configuration="Release" /p:Platform="Win32" For 64 bits: msbuild PCbuild\pcbuild.sln /p:Configuration="Release" /p:Platform="x64"
* Build project bdist_wininst
* copy Python-2.7.2/PC/pyconfig.h to Python-2.7.2/pyconfig.h (necessary otherwise distutils complains that it can't find the file when compiling packages)
* Test python:
cd PCbuild; For 32 bits: rt.bat -q -uall -rwW For 64 bits: rt.bat -q -x64 -uall -rw
Note: currently the tests will lock on test_asyncore: may be related to http://bugs.python.org/issue10469.
Create installer
* get http://sourceforge.net/projects/pywin32/files/pywin32/Build216/pywin32-216.zip/download * unzip pywin32-216.zip
cd pywin32-216
* modify files so that it will compile with visual Studio 2010:
diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/pythonwin/Scintilla/win32/scintilla.mak
--- a/pywin32-216/pythonwin/Scintilla/win32/scintilla.mak Tue Oct 18 17:21:49 2011 +0200
+++ b/pywin32-216/pythonwin/Scintilla/win32/scintilla.mak Tue Oct 18 17:24:37 2011 +0200
@@ -40,7 +40,7 @@
CXXDEBUG=-Od -MTd -DDEBUG
CXXNDEBUG=-O1 -MT -DNDEBUG -GL
NAME=-Fo
-LDFLAGS=-OPT:NOWIN98 -OPT:REF -LTCG -DEBUG
+LDFLAGS=-OPT:REF -LTCG -DEBUG
LDDEBUG=
LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
NOLOGO=-nologo
diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak
--- a/pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak Tue Oct 18 17:21:49 2011 +0200
+++ b/pywin32-216/pythonwin/Scintilla/win32/scintilla_vc6.mak Tue Oct 18 17:24:37 2011 +0200
@@ -42,7 +42,7 @@
CXXNDEBUG=-O1 -MT -DNDEBUG
NAME=-Fo
# If you have problems with lexers being linked, try removing -OPT:REF and replacing with -OPT:NOREF
-LDFLAGS=-OPT:NOWIN98 -OPT:REF
+LDFLAGS=-OPT:REF
LDDEBUG=
LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
NOLOGO=-nologo
diff -r a04f335e70f3 -r a9f6361140d1 pywin32-216/setup.py
--- a/pywin32-216/setup.py Tue Oct 18 17:21:49 2011 +0200
+++ b/pywin32-216/setup.py Tue Oct 18 17:24:37 2011 +0200
@@ -950,6 +950,7 @@
if self.debug:
largs.append("/DEBUG")
temp_manifest = os.path.join(build_temp, os.path.basename(dll) + ".manifest")
+ largs.append('/MANIFEST')
largs.append('/MANIFESTFILE:' + temp_manifest)
largs.append('/PDB:None')
largs.append("/OUT:" + dll)
@@ -1049,13 +1050,13 @@
plat_dir = "x86"
# Find the redist directory.
vckey = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,
- r"SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC",
+ r"SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC",
0, access)
val, val_typ = _winreg.QueryValueEx(vckey, "ProductDir")
- mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC90.MFC")
+ mfc_dir = os.path.join(val, "redist", plat_dir, "Microsoft.VC100.MFC")
if not os.path.isdir(mfc_dir):
raise RuntimeError("Can't find the redist dir at %r" % (mfc_dir))
- files = "mfc90.dll mfc90u.dll mfcm90.dll mfcm90u.dll Microsoft.VC90.MFC.manifest".split()
+ files = "mfc100.dll mfc100u.dll mfcm100.dll mfcm100u.dll".split()
for f in files:
self.copy_file(
os.path.join(mfc_dir, f), target_dir)* compile
For 32 bits: ..\Python-2.7.2\PCbuild\python.exe setup.py build ..\Python-2.7.2\PCbuild\python.exe setup.py install For 64 bits: ..\Python-2.7.2\PCbuild\amd64\python.exe setup.py build ..\Python-2.7.2\PCbuild\amd64\python.exe setup.py install
* Build extras and Python doc
cd Python-2.7.2\PC For 64 bits - modify icons.mak: @@ -1,5 +1,5 @@ python_icon.exe: py.res empty.obj - link /out:python_icon.exe /machine:x86 /subsystem:windows py.res empty.obj + link /out:python_icon.exe /machine:x64 /subsystem:windows py.res empty.obj nmake icons.mak cd Python-2.7.2/Doc SET HTMLHELP=hhc SET PYTHON=..\PCbuild\amd64\python make.bat checkout make.bat htmlhelp SET PYTHON=
* build MSI package
cd Python-2.7.2\Tools\msi
* Create package:
For 32 bits:
..\..\PCbuild\python.exe msi.py
For 64 bits:
Merging Microsoft.VC100.CRT in the package will fail for the moment, so you need to apply the following patch to msi.py:
diff -r 85c73eff95c1 Python-2.7.2/Tools/msi/msi.py
--- a/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 16:29:23 2011 +0200
+++ b/Python-2.7.2/Tools/msi/msi.py Tue Oct 25 17:41:17 2011 +0200
@@ -1342,29 +1342,29 @@
def merge(msi, feature, rootdir, modules):
cab_and_filecount = []
- # Step 1: Merge databases, extract cabfiles
- m = msilib.MakeMerge2()
- m.OpenLog("merge.log")
- m.OpenDatabase(msi)
- for module in modules:
- print module
- m.OpenModule(module,0)
- m.Merge(feature, rootdir)
- print "Errors:"
- for e in m.Errors:
- print e.Type, e.ModuleTable, e.DatabaseTable
- print " Modkeys:",
- for s in e.ModuleKeys: print s,
- print
- print " DBKeys:",
- for s in e.DatabaseKeys: print s,
- print
- cabname = tempfile.mktemp(suffix=".cab")
- m.ExtractCAB(cabname)
- cab_and_filecount.append((cabname, len(m.ModuleFiles)))
- m.CloseModule()
- m.CloseDatabase(True)
- m.CloseLog()
+ # # Step 1: Merge databases, extract cabfiles
+ # m = msilib.MakeMerge2()
+ # m.OpenLog("merge.log")
+ # m.OpenDatabase(msi)
+ # for module in modules:
+ # print module
+ # m.OpenModule(module,0)
+ # m.Merge(feature, rootdir)
+ # print "Errors:"
+ # for e in m.Errors:
+ # print e.Type, e.ModuleTable, e.DatabaseTable
+ # print " Modkeys:",
+ # for s in e.ModuleKeys: print s,
+ # print
+ # print " DBKeys:",
+ # for s in e.DatabaseKeys: print s,
+ # print
+ # cabname = tempfile.mktemp(suffix=".cab")
+ # m.ExtractCAB(cabname)
+ # cab_and_filecount.append((cabname, len(m.ModuleFiles)))
+ # m.CloseModule()
+ # m.CloseDatabase(True)
+ # m.CloseLog()
# Step 2: Add CAB files
i = msilib.MakeInstaller()
Then call:
..\..\PCbuild\amd64\python.exe msi.py