Removed constraints check for wxDirDialog from configure (not needed).

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 43f84a5c105da7793f876d9224c929c949632227..6d3637c38a3249f95404b82a4fcc902d566f6c89 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 
 #!/usr/bin/env python
 #----------------------------------------------------------------------
 

-import sys, os, string
+import sys, os, string, glob

 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath
 from distutils.core      import setup, Extension
 from distutils.file_util import copy_file
 from distutils.dir_util  import mkpath


@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.2b7"
+VERSION          = "2.3.3pre"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"


@@ -31,18 +31,26 @@ on.
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module

-BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)

 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_XRC = 1      # XML based resource system
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library

+BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
+                   # to be loaded from a DLL to be used from Python.

 
 

+BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)

 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 CORE_ONLY = 0      # if true, don't build any of the above

+
+

 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # files already in the distribution?
 
 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # files already in the distribution?
 

+UNICODE = 0        # This will pass the 'wxUSE_UNICODE' flag to SWIG and
+                   # will ensure that the right headers are found and the
+                   # right libs are linked.
+

 IN_CVS_TREE = 0    # Set to true if building in a full wxWindows CVS
                    # tree, otherwise will assume all needed files are
                    # available in the wxPython source distribution
 IN_CVS_TREE = 0    # Set to true if building in a full wxWindows CVS
                    # tree, otherwise will assume all needed files are
                    # available in the wxPython source distribution


@@ -52,6 +60,8 @@ WX_CONFIG = "wx-config"    # Usually you shouldn't need to touch this,
                            # version of wx-config or alternate flags,
                            # eg. as required by the .deb in-tree build.
 
                            # version of wx-config or alternate flags,
                            # eg. as required by the .deb in-tree build.
 

+BUILD_BASE = "build"
+

 # Some MSW build settings
 
 FINAL = 1          # Mirrors use of same flag in wx makefiles,
 # Some MSW build settings
 
 FINAL = 1          # Mirrors use of same flag in wx makefiles,


@@ -65,7 +75,7 @@ HYBRID = 0         # If set and not debug or FINAL, then build a
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 

-WXDLLVER = '232'   # Version part of DLL name
+WXDLLVER = '233'   # Version part of wxWindows DLL name

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -74,17 +84,22 @@ def msg(text):
     if __name__ == "__main__":
         print text
 
     if __name__ == "__main__":
         print text
 

+

 def opj(*args):
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 
 def opj(*args):
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 

+

 def libFlag():
     if FINAL:
 def libFlag():
     if FINAL:

-        return ''
+        rv = ''

     elif HYBRID:
     elif HYBRID:

-        return 'h'
+        rv = 'h'

     else:
     else:

-        return 'd'
+        rv = 'd'
+    if UNICODE:
+        rv = 'u' + rv
+    return rv

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -112,7 +127,8 @@ if bcpp_compiling:
 #----------------------------------------------------------------------
 
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
 #----------------------------------------------------------------------
 
 for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',

-             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
+             'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
+             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',

              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:


@@ -132,11 +148,27 @@ for option in ['WX_CONFIG', 'WXDLLVER', ]:
 sys.argv = filter(None, sys.argv)
 
 
 sys.argv = filter(None, sys.argv)
 
 

+
+#----------------------------------------------------------------------
+# sanity checks
+

 if CORE_ONLY:
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
 if CORE_ONLY:
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0

+    BUILD_GIZMOS = 0
+    BUILD_DLLWIDGET = 0
+
+
+if UNICODE and os.name != 'nt':
+    print "UNICODE is currently only supported on Win32"
+    sys.exit()
+
+
+if UNICODE:
+    BUILD_BASE = BUILD_BASE + '.unicode'
+

 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff


@@ -144,9 +176,13 @@ if CORE_ONLY:
 
 if os.name == 'nt':
     # Set compile flags and such for MSVC.  These values are derived
 
 if os.name == 'nt':
     # Set compile flags and such for MSVC.  These values are derived

-    # from the wxWindows makefiles for MSVC, others will probably
-    # vary...
-    WXDIR = os.environ['WXWIN']
+    # from the wxWindows makefiles for MSVC, other compilers settings
+    # will probably vary...
+    if os.environ.has_key('WXWIN'):
+        WXDIR = os.environ['WXWIN']
+    else:
+        msg("WARNING: WXWIN not set in environment.")
+        WXDIR = '..'  # assumes in CVS tree

     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
 
     WXPLAT = '__WXMSW__'
     GENDIR = 'msw'
 


@@ -211,12 +247,14 @@ if os.name == 'nt':
             'advapi32', 'wsock32']
 
 
             'advapi32', 'wsock32']
 
 

-    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC on some machines
+    cflags = [
+             # '/GX-'  # workaround for internal compiler error in MSVC on some machines
+             ]

     lflags = None
 
 
     if bcpp_compiling:  # overwrite it
     lflags = None
 
 
     if bcpp_compiling:  # overwrite it

-        cflags = ['-5', '-VF',  ### To supplort MSVC spurious semicolons in the class scope
+        cflags = ['-5', '-VF',  ### To support MSVC spurious semicolons in the class scope

                   ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
                   '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
                   '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
                   ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
                   '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
                   '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')


@@ -233,7 +271,7 @@ if os.name == 'nt':
 
 
 
 
 
 

-elif os.name == 'posix' and sys.platform == "darwin1":
+elif os.name == 'posix' and sys.platform[:6] == "darwin":

     # Flags and such for a Darwin (Max OS X) build of Python
 
     WXDIR = '..'              # assumes IN_CVS_TREE
     # Flags and such for a Darwin (Max OS X) build of Python
 
     WXDIR = '..'              # assumes IN_CVS_TREE


@@ -303,6 +341,9 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword',
              #'-docstring', '-Sbefore',
              '-I./src', '-D'+WXPLAT,
              ]
              #'-docstring', '-Sbefore',
              '-I./src', '-D'+WXPLAT,
              ]

+if UNICODE:
+    swig_args.append('-DwxUSE_UNICODE')
+

 swig_deps = ['src/my_typemaps.i']
 
 
 swig_deps = ['src/my_typemaps.i']
 
 


@@ -316,8 +357,7 @@ if not GL_ONLY:
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
                    'printfw.i', 'sizers.i', 'clip_dnd.i',
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
                    'printfw.i', 'sizers.i', 'clip_dnd.i',

-                   'filesys.i', 'streams.i',
-                   ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
+                   'filesys.i', 'streams.i', 'utils.i'

                    ]
 
     swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
                    ]
 
     swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,


@@ -383,20 +423,6 @@ if not GL_ONLY:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

-    # Extension for the utils module
-    swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('utilsc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
-
-

     # Extension for the calendar module
     swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)
     # Extension for the calendar module
     swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)


@@ -553,7 +579,7 @@ if not GL_ONLY and BUILD_STC:
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')])
 
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')])
 

-    # copy a project specific py module to the main package dir
+    # copy a contrib project specific py module to the main package dir

     copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
 
     # add some include dirs to the standard set
     copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
 
     # add some include dirs to the standard set


@@ -698,6 +724,7 @@ if not GL_ONLY and BUILD_XRC:
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,

+                                '%s/xh_gdctl.cpp' % XMLLOC,

                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,
                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,


@@ -723,13 +750,8 @@ if not GL_ONLY and BUILD_XRC:
 
                                 '%s/xh_unkwn.cpp' % XMLLOC,
                                 '%s/xml.cpp' % XMLLOC,
 
                                 '%s/xh_unkwn.cpp' % XMLLOC,
                                 '%s/xml.cpp' % XMLLOC,

-                                '%s/xmlbin.cpp' % XMLLOC,
-                                '%s/xmlbinz.cpp' % XMLLOC,
-                                '%s/xmlexpat.cpp' % XMLLOC,
-

                                 '%s/xmlres.cpp' % XMLLOC,
                                 '%s/xmlrsall.cpp' % XMLLOC,
                                 '%s/xmlres.cpp' % XMLLOC,
                                 '%s/xmlrsall.cpp' % XMLLOC,

-                                '%s/xmlwrite.cpp' % XMLLOC,

 
                              ] + swig_sources,
 
 
                              ] + swig_sources,
 


@@ -774,8 +796,9 @@ if not GL_ONLY and BUILD_GIZMOS:
     ext = Extension('gizmosc', [
                                 '%s/dynamicsash.cpp' % GIZMOLOC,
                                 '%s/editlbox.cpp' % GIZMOLOC,
     ext = Extension('gizmosc', [
                                 '%s/dynamicsash.cpp' % GIZMOLOC,
                                 '%s/editlbox.cpp' % GIZMOLOC,

-                                '%s/multicell.cpp' % GIZMOLOC,
+                                #'%s/multicell.cpp' % GIZMOLOC,

                                 '%s/splittree.cpp' % GIZMOLOC,
                                 '%s/splittree.cpp' % GIZMOLOC,

+                                '%s/ledctrl.cpp'   % GIZMOLOC,

                              ] + swig_sources,
 
                     include_dirs =  gizmos_includes,
                              ] + swig_sources,
 
                     include_dirs =  gizmos_includes,


@@ -792,6 +815,52 @@ if not GL_ONLY and BUILD_GIZMOS:
 
 
 
 
 
 

+#----------------------------------------------------------------------
+# Define the DLLWIDGET  extension module
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_DLLWIDGET:
+    msg('Preparing DLLWIDGET...')
+    location = 'contrib/dllwidget'
+    swig_files = ['dllwidget_.i']
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args)
+
+    # copy a contrib project specific py module to the main package dir
+    copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
+
+    ext = Extension('dllwidget_c', [
+                                '%s/dllwidget.cpp' % location,
+                             ] + swig_sources,
+
+                    include_dirs =  includes,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+
+#----------------------------------------------------------------------
+# Tools and scripts
+#----------------------------------------------------------------------
+
+TOOLS = [("wxPython/tools",        glob.glob("tools/*.py")),
+         ("wxPython/tools/XRCed",  glob.glob("tools/XRCed/*.py") +
+                                   glob.glob("tools/XRCed/*.xrc") +
+                                   ["tools/XRCed/CHANGES",
+                                    "tools/XRCed/TODO",
+                                    "tools/XRCed/README"]),
+         ]
+
+
+

 
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever


@@ -811,11 +880,16 @@ if __name__ == "__main__":
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',

-                          PKGDIR+'.lib.mixins'
+                          PKGDIR+'.lib.mixins',
+                          PKGDIR+'.lib.PyCrust',

                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
                           ],
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,

+
+              options = { 'build' : { 'build_base' : BUILD_BASE }}
+
+              ##data_files = TOOLS,

               )
 
     else:
               )
 
     else:


@@ -832,6 +906,7 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,

+

               )
 
 
               )