[Commits] (john) more changes to get builds working and work around bugs in build scripts

commits at osafoundation.org commits at osafoundation.org
Sun Apr 11 11:51:43 PDT 2004


Commit by: john
Modified files:
wxPythonSrc-2.5.1.5/wxPython/setup.py 2.2 2.3
wxPythonSrc-2.5.1.5/wxPython/config.py 2.3 2.4
wxPythonSrc-2.5.1.5/__hardhat__.py 1.6 1.7

Log message:
more changes to get builds working and work around bugs in build scripts


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/wxPython/setup.py.diff?r1=text&tr1=2.2&r2=text&tr2=2.3
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/wxPython/config.py.diff?r1=text&tr1=2.3&r2=text&tr2=2.4
http://cvs.osafoundation.org/index.cgi/wxPythonSrc-2.5.1.5/__hardhat__.py.diff?r1=text&tr1=1.6&r2=text&tr2=1.7

Index: wxPythonSrc-2.5.1.5/wxPython/config.py
diff -u wxPythonSrc-2.5.1.5/wxPython/config.py:2.3 wxPythonSrc-2.5.1.5/wxPython/config.py:2.4
--- wxPythonSrc-2.5.1.5/wxPython/config.py:2.3	Fri Apr  9 17:46:46 2004
+++ wxPythonSrc-2.5.1.5/wxPython/config.py	Sun Apr 11 11:51:11 2004
@@ -15,7 +15,7 @@
 # Author:      Robin Dunn
 #
 # Created:     23-March-2004
-# RCS-ID:      $Id: config.py,v 2.3 2004/04/10 00:46:46 john Exp $
+# RCS-ID:      $Id: config.py,v 2.4 2004/04/11 18:51:11 john Exp $
 # Copyright:   (c) 2004 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
@@ -140,11 +140,11 @@
 
 # Some MSW build settings
 
-FINAL = 1          # Mirrors use of same flag in wx makefiles,
+FINAL = 0          # Mirrors use of same flag in wx makefiles,
                    # (0 or 1 only) should probably find a way to
                    # autodetect this...
 
-HYBRID = 0         # If set and not debug or FINAL, then build a
+HYBRID = 1         # If set and not debug or FINAL, then build a
                    # hybrid extension that can be used by the
                    # non-debug version of python, but contains
                    # debugging symbols for wxWidgets and wxPython.

Index: wxPythonSrc-2.5.1.5/__hardhat__.py
diff -u wxPythonSrc-2.5.1.5/__hardhat__.py:1.6 wxPythonSrc-2.5.1.5/__hardhat__.py:1.7
--- wxPythonSrc-2.5.1.5/__hardhat__.py:1.6	Sat Apr 10 11:05:15 2004
+++ wxPythonSrc-2.5.1.5/__hardhat__.py	Sun Apr 11 11:51:12 2004
@@ -168,19 +168,45 @@
 
         os.putenv('WXWIN', os.getcwd())
 
-        os.chdir("wxPython")
-
         if version == 'release':
+            destination = os.path.join (buildenv['pythonlibdir'], 'site-packages', 'wx')
+            hardhatlib.copyFiles('lib/vc_dll', destination, ['*251_*.dll'])
+
+            os.chdir("wxPython")
+            hardhatlib.executeCommand (buildenv,
+                                       info['name'],
+                                       [buildenv['python'],
+                                        'setup.py',
+                                        'build_ext', 
+                                        '--inplace',
+                                        'install',
+                                        'FINAL=1',
+                                        'HYBRID=0'],
+                                       "Building wxPython")
 
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['python'], 'setup.py', 'build_ext', 
-             '--inplace', 'install'], "Building wxPython")
+            # _*.pyd also copies _*_d.pyd, which is unnecessary, however, the
+            # files that should have been created are _*.pyc, so when we fix that
+            # we should change '_*.pyd' to '_*.pyc' in the following line
+            hardhatlib.copyFiles('wx', destination, ['_*.pyd'])
 
         elif version == 'debug':
+            destination = os.path.join (buildenv['pythonlibdir_d'], 'site-packages', 'wx')
+            hardhatlib.copyFiles('lib/vc_dll', destination, ['*251d_*.dll'])
+
+            os.chdir("wxPython")
+            hardhatlib.executeCommand (buildenv,
+                                       info['name'],
+                                       [buildenv['python_d'],
+                                        'setup.py',
+                                        'build_ext', 
+                                        '--inplace',
+                                        '--debug',
+                                        'install',
+                                        'FINAL=1',
+                                        'HYBRID=0'],
+                                       "Building wxPython")
 
-            hardhatlib.executeCommand( buildenv, info['name'],
-             [buildenv['python_d'], 'setup.py', 'build_ext', 
-             '--inplace', '--debug', 'install'], "Building wxPython")
+            hardhatlib.copyFiles('wx', destination, ['_*_d.pyd'])
 
 def clean(buildenv):
 

Index: wxPythonSrc-2.5.1.5/wxPython/setup.py
diff -u wxPythonSrc-2.5.1.5/wxPython/setup.py:2.2 wxPythonSrc-2.5.1.5/wxPython/setup.py:2.3
--- wxPythonSrc-2.5.1.5/wxPython/setup.py:2.2	Fri Apr  9 17:46:46 2004
+++ wxPythonSrc-2.5.1.5/wxPython/setup.py	Sun Apr 11 11:51:11 2004
@@ -6,7 +6,7 @@
 # Author:      Robin Dunn
 #
 # Created:     12-Oct-2000
-# RCS-ID:      $Id: setup.py,v 2.2 2004/04/10 00:46:46 john Exp $
+# RCS-ID:      $Id: setup.py,v 2.3 2004/04/11 18:51:11 john Exp $
 # Copyright:   (c) 2000 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
@@ -503,34 +503,34 @@
 # Define the ACTIVEX extension module (experimental)
 #----------------------------------------------------------------------
 
-# sources don't include activex, so I commented it out -- DJA
+# active x files are not in the release so this doesn't work -- DJA
 #if BUILD_ACTIVEX:
-#    msg('Preparing ACTIVEX...')
-#    location = 'contrib/activex'
-#    axloc = opj(location, "wxie")
-#
-#    swig_files = ['activex.i', ]
-#
-#    swig_sources = run_swig(swig_files, location, '', PKGDIR,
-#                            USE_SWIG, swig_force, swig_args, swig_deps +
-#                            [ '%s/_activex_ex.py' % location])
-#
-#
-#    ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
-#                                 '%s/wxactivex.cpp' % axloc,
-#                                 ] + swig_sources,
-#
-#                    include_dirs =  includes + [ axloc ],
-#                    define_macros = defines,
-#
-#                    library_dirs = libdirs,
-#                    libraries = libs,
-#
-#                    extra_compile_args = cflags,
-#                    extra_link_args = lflags,
-#                    )
+    #msg('Preparing ACTIVEX...')
+    #location = 'contrib/activex'
+    #axloc = opj(location, "wxie")
 
-    wxpExtensions.append(ext)
+    #swig_files = ['activex.i', ]
+
+    #swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            #USE_SWIG, swig_force, swig_args, swig_deps +
+                            #[ '%s/_activex_ex.py' % location])
+
+
+    #ext = Extension('_activex', ['%s/IEHtmlWin.cpp' % axloc,
+                                 #'%s/wxactivex.cpp' % axloc,
+                                 #] + swig_sources,
+
+                    #include_dirs =  includes + [ axloc ],
+                    #define_macros = defines,
+
+                    #library_dirs = libdirs,
+                    #libraries = libs,
+
+                    #extra_compile_args = cflags,
+                    #extra_link_args = lflags,
+                    #)
+
+    #wxpExtensions.append(ext)
 
 
 #----------------------------------------------------------------------



More information about the Commits mailing list