Build/installer support for building with MSVC 7.1 and Python 2.4

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/b.win32 b/wxPython/b.win32
index 4d8b2e894097fc2b9459ade46c137ad70edffd2f..2059a8a45f5be63651f3d2d02b97037ebed13300 100644 (file)
--- a/wxPython/b.win32
+++ b/wxPython/b.win32
@@ -6,16 +6,15 @@ FLAGS="USE_SWIG=1 SWIG=$PROJECTS/SWIG-cvs/swig.exe"
 
 #  Use non-default python?
 case $1 in
-    21 | 2.1) VER=21 ;;
-    22 | 2.2) VER=22 ;;
-    23 | 2.3) VER=23 ;;
+    21 | 2.1) VER=21; shift ;;
+    22 | 2.2) VER=22; shift ;;
+    23 | 2.3) VER=23; shift ;;
+    24 | 2.4) VER=24; shift ;;
 
-    *)         echo You must specify the Python version as first parameter.
-       exit -1
+    *)         VER=24
 esac
 
 PYTHON=$TOOLS/python$VER/python.exe
-shift
 
 SETUP="$PYTHON -u setup.py"
 $PYTHON -c "import sys;print '\n', sys.version, '\n'"

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 77ffa46f1bf5d697580d821ad6cf123d4f699774..488099633c800bab866835e41562c0bad7d900f6 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -74,10 +74,7 @@ Name: pthfile;  Description: "Make this install be the default wxPython"; Types:
 ;;------------------------------------------------------------
 
 [Files]
-Source: "distrib\msw\MSVCRT.dll";        DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "distrib\msw\MSVCIRT.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "distrib\msw\MSVCP60.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-
+%(RTDLL)s
 Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 %(MSLU)s
 
@@ -545,6 +542,7 @@ def build_locale_string(pkgdir):
     os.path.walk('wx\\locale', walk_helper, stringlst)
     return '\n'.join(stringlst)
 
+
 def get_system_dir():
     for p in [r"C:\WINNT\SYSTEM32",
               r"C:\WINDOWS\SYSTEM32",
@@ -553,6 +551,7 @@ def get_system_dir():
             return p
     raise IOError, "System dir not found"
 
+
 def get_batch_files():
     globs = {}
     execfile("scripts/CreateBatchFiles.py", globs)
@@ -560,6 +559,21 @@ def get_batch_files():
     scripts = ['Type: files; Name: "{code:GetPythonDir}\Scripts\%s.bat";' % i[0] for i in scripts]
     return '\n'.join(scripts)
 
+
+runtime_template = 'Source: "%s"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core'
+
+def get_runtime_dlls(PYVER):
+    if PYVER == "py24":
+        source = [ r"distrib\msw\msvcr71.dll",
+                   r"distrib\msw\msvcp71.dll" ]
+    else:
+        source = [ r"distrib\msw\MSVCRT.dll",
+                   r"distrib\msw\MSVCIRT.dll",
+                   r"distrib\msw\MSVCP60.dll" ]
+    DLLs = [runtime_template % dll for dll in source]    
+    return '\n'.join(DLLs)
+
+
 #----------------------------------------------------------------------
 
 def main():
@@ -582,7 +596,8 @@ def main():
     UNINSTALL_BATCH = get_batch_files()
     PKGDIR          = open('src/wx.pth').read()
     LOCALE          = build_locale_string(PKGDIR)
-
+    RTDLL           = get_runtime_dlls(PYVER)
+    
     print """Building Win32 installer for wxPython:
     VERSION    = %(VERSION)s
     SHORTVER   = %(SHORTVER)s
@@ -595,7 +610,9 @@ def main():
     SYSDIR     = %(SYSDIR)s
     """ % vars()
 
-    if PYTHONVER >= "2.2":
+    if PYTHONVER >= "2.4":
+        IF22 = r"InstallDir := InstallDir + 'Lib\site-packages';"
+    elif PYTHONVER >= "2.2":
         IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';"
     else:
         IF22 = ""
@@ -622,7 +639,7 @@ def main():
     f = open(ISSDEMOFILE, "w")
     f.write(ISS_DocDemo_Template % vars())
     f.close()
-    
+
     TOOLS = os.environ['TOOLS']
     if TOOLS.startswith('/cygdrive'):
         TOOLS = r"c:\TOOLS"  # temporary hack until I convert everything over to bash

diff --git a/wxPython/distrib/msw/.mymake b/wxPython/distrib/msw/.mymake
index 21ffb0e98a4da088294c7c78d21ed1b925ccae80..ca42ce7672c58f28dd47fc4825806016cb990231 100644 (file)
--- a/wxPython/distrib/msw/.mymake
+++ b/wxPython/distrib/msw/.mymake
@@ -1,7 +1,7 @@
 #! /bin/bash
 
-COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1"
-HYBRID_FLAGS="DEBUG_FLAG=1 CXXFLAGS=/D__NO_VC_CRTDBG__ WXDEBUGFLAG=h"
+COMMON_FLAGS="OFFICIAL_BUILD=1 SHARED=1 MONOLITHIC=1 USE_OPENGL=1 CXXFLAGS=/D__NO_VC_CRTDBG__ "
+HYBRID_FLAGS="DEBUG_FLAG=1 WXDEBUGFLAG=h"
 MAKE_FLAGS=$COMMON_FLAGS
 
 

diff --git a/wxPython/distrib/msw/msvcp71.dll b/wxPython/distrib/msw/msvcp71.dll
new file mode 100644 (file)
index 0000000..9ed0d17
Binary files /dev/null and b/wxPython/distrib/msw/msvcp71.dll differ

diff --git a/wxPython/distrib/msw/msvcr71.dll b/wxPython/distrib/msw/msvcr71.dll
new file mode 100644 (file)
index 0000000..9d9e028
Binary files /dev/null and b/wxPython/distrib/msw/msvcr71.dll differ