Now we can build all tarballs on one (Unix shell) box using pre-flight.sh.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 566b4f8b616470dd7e9494afd64319caa662df42..42d59936a9366b327dfdc36afd5ce290f4c9fe7d 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -11,14 +11,14 @@
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 

-import sys
+import sys, os

 
 
 # The full contents of the wx.build.config module used to be located
 # here in setup.py.  They were split into a separate module so it will
 # be installed with wxPython and can then be used by the build scripts
 
 
 # The full contents of the wx.build.config module used to be located
 # here in setup.py.  They were split into a separate module so it will
 # be installed with wxPython and can then be used by the build scripts

-# of other extension modules that wich to be wxPython compatible.  The
-# split is still fairly new and hasn't been tested by building
+# of other extension modules that wish to be wxPython compatible.
+# The split is still fairly new and hasn't been tested by building

 # third-party extensions yet, so expect some things to still shift
 # back and forth, and also more stuff in config.py will get converted
 # to functions, etc.
 # third-party extensions yet, so expect some things to still shift
 # back and forth, and also more stuff in config.py will get converted
 # to functions, etc.


@@ -29,6 +29,15 @@ import sys
 # config .py in the same place as setup.py, and then copy it to
 # wx/build as needed below.
 
 # config .py in the same place as setup.py, and then copy it to
 # wx/build as needed below.
 

+# To fully support external builds, we need to have a build options
+# file that is created whenever a new wxPython build is performed.
+# We happen to be doing that here in this script, so make sure to
+# remove the build_options.py file, so that config.py will recreate it.
+
+for bo_name in ["build_options.py", "build_options.pyc"]:
+    if os.path.exists(bo_name):
+        os.remove(bo_name)
+

 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
 
 sys.setup_is_main =  __name__ == "__main__"  # an icky hack!
 from config import *
 


@@ -38,7 +47,9 @@ from config import *
 #----------------------------------------------------------------------
 
 copy_file('config.py', 'wx/build', update=1, verbose=1)
 #----------------------------------------------------------------------
 
 copy_file('config.py', 'wx/build', update=1, verbose=1)

+copy_file('build_options.py', 'wx/build', update=1, verbose=1)

 CLEANUP.append('wx/build/config.py')
 CLEANUP.append('wx/build/config.py')

+CLEANUP.append('wx/build/build_options.py')

 
 #----------------------------------------------------------------------
 # Update the version file
 
 #----------------------------------------------------------------------
 # Update the version file


@@ -65,6 +76,24 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 CLEANUP.append('wx/__version__.py')
 
 
 CLEANUP.append('wx/__version__.py')
 
 

+#----------------------------------------------------------------------
+# Write the SWIG version to a header file
+#----------------------------------------------------------------------
+
+if USE_SWIG:
+    try:
+        SVER = swig_version()
+        open('include/wx/wxPython/swigver.h', 'w').write('''\
+// This file was generated by setup.py
+
+#define wxPy_SWIG_VERSION "SWIG-%s"
+''' % SVER)
+        msg('Using SWIG-' + SVER)
+    except:
+        msg('\nUnable to get SWIG version number\n')
+        
+
+

 #----------------------------------------------------------------------
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords 
 #----------------------------------------------------------------------
 # patch distutils if it can't cope with the "classifiers" or
 # "download_url" keywords 


@@ -110,6 +139,7 @@ swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
                           'src/_validator.i',
                           'src/_window.i',
                           'src/_control.i',
                           'src/_validator.i',
                           'src/_window.i',
                           'src/_control.i',

+                          'src/_swigtype.i',

                           ],
                         True)
 
                           ],
                         True)
 


@@ -137,7 +167,6 @@ else:
 
 
 ext = Extension('_core_', ['src/helpers.cpp',
 
 
 ext = Extension('_core_', ['src/helpers.cpp',

-                           'src/libpy.c',

                            ] + rc_file + swig_sources,
 
                 include_dirs = includes,
                            ] + rc_file + swig_sources,
 
                 include_dirs = includes,


@@ -177,6 +206,7 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_icon.i',
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_icon.i',
                          'src/_pen.i',
                          'src/_palette.i',

+                         'src/_renderer.i',

                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,


@@ -255,6 +285,9 @@ swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR,
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',
                           'src/_pycontrol.i',
                           'src/_cshelp.i',
                           'src/_dragimg.i',

+                          'src/_datectrl.i',
+                          'src/_hyperlink.i',
+                          'src/_picker.i',

                           ],
                         True)
 ext = Extension('_controls_', swig_sources,
                           ],
                         True)
 ext = Extension('_controls_', swig_sources,


@@ -294,6 +327,7 @@ swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',
                           'src/_display.i',
                           'src/_clipbrd.i',
                           'src/_stdpaths.i',

+                          'src/_power.i',

                           ],
                         True)
 ext = Extension('_misc_', swig_sources,
                           ],
                         True)
 ext = Extension('_misc_', swig_sources,


@@ -356,14 +390,16 @@ ext = Extension('_html', swig_sources,
 wxpExtensions.append(ext)
 
 
 wxpExtensions.append(ext)
 
 

-
+mediaLibs = libs[:]
+if not MONOLITHIC:
+    mediaLibs += makeLibName('media')

 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_media', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
 swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_media', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = mediaLibs,

                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends


@@ -417,14 +453,32 @@ ext = Extension('_xrc',
                 define_macros = defines,
 
                 library_dirs = libdirs,
                 define_macros = defines,
 
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = libs + makeLibName('xrc'),
+
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                )
+wxpExtensions.append(ext)
+
+

 
 

+swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_richtext', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs + makeLibName('richtext'),

                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

+                **depends

                 )
 wxpExtensions.append(ext)
 
 
                 )
 wxpExtensions.append(ext)
 
 

+
+
+

 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------


@@ -439,8 +493,9 @@ if BUILD_GLCANVAS:
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
     gl_libs = []
     if os.name == 'posix':
         gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]

-        gl_lflags = gl_config.split() + lflags
+        gl_lflags = gl_config.split()

         gl_libs = libs
         gl_libs = libs

+        

     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
     else:
         gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags


@@ -526,7 +581,11 @@ if BUILD_STC:
     swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
     swig_sources = run_swig(['stc.i'], location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],

-                            [opj(STC_H, 'stc.h')] + swig_deps)
+                            [opj(STC_H, 'stc.h'),
+                             opj(location, "_stc_utf8_methods.py"),
+                             opj(location, "_stc_docstrings.i"),
+                             opj(location, "_stc_gendocs.i"),
+                             ] + swig_deps)

 
     ext = Extension('_stc',
                     swig_sources,
 
     ext = Extension('_stc',
                     swig_sources,


@@ -544,38 +603,6 @@ if BUILD_STC:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

-
-#----------------------------------------------------------------------
-# Define the IEWIN extension module (experimental)
-#----------------------------------------------------------------------
-
-if BUILD_IEWIN:
-    msg('Preparing IEWIN...')
-    location = 'contrib/iewin'
-
-    swig_files = ['iewin.i', ]
-
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-
-
-    ext = Extension('_iewin', ['%s/IEHtmlWin.cpp' % location,
-                               '%s/wxactivex.cpp' % location,
-                             ] + swig_sources,
-
-                    include_dirs =  includes + CONTRIBS_INC,
-                    define_macros = defines,
-
-                    library_dirs = libdirs,
-                    libraries = libs,
-
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-
-    wxpExtensions.append(ext)
-
-

 #----------------------------------------------------------------------
 # Define the ACTIVEX extension module (experimental)
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the ACTIVEX extension module (experimental)
 #----------------------------------------------------------------------


@@ -636,6 +663,33 @@ if BUILD_GIZMOS:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

+#----------------------------------------------------------------------
+# Define the ANIMATE  extension module
+#----------------------------------------------------------------------
+
+if BUILD_ANIMATE:
+    msg('Preparing ANIMATE...')
+    location = 'contrib/animate'
+
+    swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+
+    ext = Extension('_animate',
+                    swig_sources,
+
+                    include_dirs =  includes + CONTRIBS_INC,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs + makeLibName('animate'),
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+

 
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module
 
 #----------------------------------------------------------------------
 # Define the DLLWIDGET  extension module


@@ -714,7 +768,7 @@ else:
 
 
 if INSTALL_MULTIVERSION:
 
 
 if INSTALL_MULTIVERSION:

-    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)
+    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS, shortVer=not EP_FULL_VER)

     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else:
     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else:


@@ -752,6 +806,8 @@ if __name__ == "__main__":
                           'wx',
                           'wx.build',
                           'wx.lib',
                           'wx',
                           'wx.build',
                           'wx.lib',

+                          'wx.lib.analogclock',
+                          'wx.lib.analogclock.lib_setup',

                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',
                           'wx.lib.colourchooser',
                           'wx.lib.editor',
                           'wx.lib.floatcanvas',