Applied patch [ 1344168 ] wxUniv (on MSW) IM input no response

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 64642a94304b206536c2679a4302418e3664aa74..ebff62958b8632c70ea4bb53946016332dae4307 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,10 +37,10 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets

-VER_MINOR        = 5
-VER_RELEASE      = 3
-VER_SUBREL       = 2      # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS        = "pre"     # release flags, such as prerelease num, unicode, etc.
+VER_MINOR        = 7
+VER_RELEASE      = 0
+VER_SUBREL       = 0      # wxPython release num for x.y.z release of wxWidgets
+VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.

 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"


@@ -55,8 +55,8 @@ LONG_DESCRIPTION = """\
 wxPython is a GUI toolkit for Python that is a wrapper around the
 wxWidgets C++ GUI library.  wxPython provides a large variety of
 window types and controls, all implemented with a native look and
 wxPython is a GUI toolkit for Python that is a wrapper around the
 wxWidgets C++ GUI library.  wxPython provides a large variety of
 window types and controls, all implemented with a native look and

-feel (by using the native widgets) on the platforms it is supported
-on.
+feel (by using the native widgets) on the platforms upon which it is
+supported.

 """
 
 CLASSIFIERS      = """\
 """
 
 CLASSIFIERS      = """\


@@ -79,14 +79,14 @@ Topic :: Software Development :: User Interfaces
 # Config values below this point can be reset on the setup.py command line.
 
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
 # Config values below this point can be reset on the setup.py command line.
 
 BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module

-BUILD_OGL = 1      # If true, build the contrib/ogl extension module
+BUILD_OGL = 0      # If true, build the contrib/ogl extension module

 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library

+BUILD_ANIMATE = 1  # Build a module for the animate contrib library

 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 
                    # Internet Explorer wrapper (experimental)
 BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
                    # to be loaded from a DLL and to be used from Python.
 
                    # Internet Explorer wrapper (experimental)

-BUILD_IEWIN = (os.name == 'nt')

 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 
 BUILD_ACTIVEX = (os.name == 'nt')  # new version of IEWIN and more
 
 


@@ -129,7 +129,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
                    # created that adds that dir to the sys.path.  In
                    # addition, a wxselect.py module will be installed
                    # to site-pacakges that will allow applications to
                    # created that adds that dir to the sys.path.  In
                    # addition, a wxselect.py module will be installed
                    # to site-pacakges that will allow applications to

-                   # choose a specific version if more than one are
+                   # choose a specific version if more than one is

                    # installed.
                    
 FLAVOUR = ""       # Optional flavour string to be appended to VERSION
                    # installed.
                    
 FLAVOUR = ""       # Optional flavour string to be appended to VERSION


@@ -138,8 +138,14 @@ FLAVOUR = ""       # Optional flavour string to be appended to VERSION
 EP_ADD_OPTS = 1    # When doing MULTIVERSION installs the wx port and
                    # ansi/unicode settings can optionally be added to the
                    # subdir path used in site-packages
 EP_ADD_OPTS = 1    # When doing MULTIVERSION installs the wx port and
                    # ansi/unicode settings can optionally be added to the
                    # subdir path used in site-packages

-                   
-                   
+
+EP_FULL_VER = 0    # When doing MULTIVERSION installs the default is to
+                   # put only 2 or 3 (depending on stable/unstable) of
+                   # the version compnonents into the "extra path"
+                   # subdir of site-packages.  Setting this option to
+                   # 1 will cause the full 4 components of the version
+                   # number to be used instead.
+                                      

 WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # it to pass an alternate version of wx-config or alternate
                    # flags, eg. as required by the .deb in-tree build.  By
 WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # it to pass an alternate version of wx-config or alternate
                    # flags, eg. as required by the .deb in-tree build.  By


@@ -147,6 +153,15 @@ WX_CONFIG = None   # Usually you shouldn't need to touch this, but you can set
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 
                    # version, port, etc. and it will be looked for on the
                    # default $PATH.
 

+SYS_WX_CONFIG = None # When installing an in tree build, setup.py uses wx-config
+                     # for two different purposes.  First, to determine the prefix
+                    # where files will be installed, and secondly, to initialise
+                    # build_options.py with the correct options for it.
+                    # WX_CONFIG is used for the first task.  SYS_WX_CONFIG may
+                    # be set independently, to the value that should appear in
+                    # build_options.py, if it is different to that.  The default
+                    # is to use the value of WX_CONFIG.
+

 WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets available.
                    # Setting this value lets you select which will be used for
                    # the wxPython build.  Possibilites are 'gtk', 'gtk2' and
 WXPORT = 'gtk2'    # On Linux/Unix there are several ports of wxWidgets available.
                    # Setting this value lets you select which will be used for
                    # the wxPython build.  Possibilites are 'gtk', 'gtk2' and


@@ -233,17 +248,19 @@ if sys.platform[:6] == "darwin":
 if os.name == 'nt':
     WXPORT = 'msw'
 
 if os.name == 'nt':
     WXPORT = 'msw'
 

+WXPYTHON_TYPE_TABLE = '_wxPython_table'

 
 #----------------------------------------------------------------------
 # Check for build flags on the command line
 #----------------------------------------------------------------------
 
 # Boolean (int) flags
 
 #----------------------------------------------------------------------
 # Check for build flags on the command line
 #----------------------------------------------------------------------
 
 # Boolean (int) flags

-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 
-             'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+              'BUILD_GIZMOS', 'BUILD_GLCANVAS', 
+              'BUILD_OGL', 'BUILD_STC',     

              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',

-             'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
+             'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS', 'EP_FULL_VER',

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


@@ -253,8 +270,8 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC',
                 sys.argv[x] = ''
 
 # String options
                 sys.argv[x] = ''
 
 # String options

-for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
-               'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR', 
+for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
+               'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR', 

                ]:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:
                ]:
     for x in range(len(sys.argv)):
         if sys.argv[x].find(option) == 0:


@@ -266,13 +283,48 @@ for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG',
 sys.argv = filter(None, sys.argv)
 
 
 sys.argv = filter(None, sys.argv)
 
 

+#----------------------------------------------------------------------
+# build options file
+#----------------------------------------------------------------------
+
+if SYS_WX_CONFIG is None:
+    SYS_WX_CONFIG = WX_CONFIG
+
+build_options_template = """
+UNICODE=%d
+UNDEF_NDEBUG=%d
+INSTALL_MULTIVERSION=%d
+FLAVOUR="%s"
+EP_ADD_OPTS=%d
+EP_FULL_VER=%d
+WX_CONFIG="%s"
+WXPORT="%s"
+MONOLITHIC=%d
+FINAL=%d
+HYBRID=%d
+""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
+       EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
+
+try: 
+    from build_options import *
+except:
+    build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
+    if not os.path.exists(build_options_file):
+        try:
+            myfile = open(build_options_file, "w")
+            myfile.write(build_options_template)
+            myfile.close()
+        except:
+            print "WARNING: Unable to create build_options.py."
+    
+

 #----------------------------------------------------------------------
 # some helper functions
 #----------------------------------------------------------------------
 
 def Verify_WX_CONFIG():
     """ Called below for the builds that need wx-config, if WX_CONFIG
 #----------------------------------------------------------------------
 # some helper functions
 #----------------------------------------------------------------------
 
 def Verify_WX_CONFIG():
     """ Called below for the builds that need wx-config, if WX_CONFIG

-        is not set then determins the flags needed based on build
+        is not set then determines the flags needed based on build

         options and searches for wx-config on the PATH.  
     """
     # if WX_CONFIG hasn't been set to an explicit value then construct one.
         options and searches for wx-config on the PATH.  
     """
     # if WX_CONFIG hasn't been set to an explicit value then construct one.


@@ -301,7 +353,7 @@ def Verify_WX_CONFIG():
             msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")
             # should we exit?
 
             msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")
             # should we exit?
 

-        # TODO:  exeucte WX_CONFIG --list and verify a matching config is found
+        # TODO:  execute WX_CONFIG --list and verify a matching config is found

         
 
 def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         
 
 def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,


@@ -337,12 +389,17 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
 
         if not cleaning and USE_SWIG:
             for dep in swig_deps:
 
         if not cleaning and USE_SWIG:
             for dep in swig_deps:

-                if newer(dep, py_file) or newer(dep, cpp_file):
-                    force = 1
-                    break
+                # this may fail for external builds, but it's not 
+                # a fatal error, so keep going.
+                try:
+                    if newer(dep, py_file) or newer(dep, cpp_file):
+                        force = 1
+                        break
+                except:
+                    pass

 
             if force or newer(i_file, py_file) or newer(i_file, cpp_file):
 
             if force or newer(i_file, py_file) or newer(i_file, cpp_file):

-                ## we need forward slashes here even on win32
+                ## we need forward slashes here, even on win32

                 #cpp_file = opj(cpp_file) #'/'.join(cpp_file.split('\\'))
                 #i_file = opj(i_file)     #'/'.join(i_file.split('\\'))
 
                 #cpp_file = opj(cpp_file) #'/'.join(cpp_file.split('\\'))
                 #i_file = opj(i_file)     #'/'.join(i_file.split('\\'))
 


@@ -585,8 +642,6 @@ def getExtraPath(shortVer=True, addOpts=False):
 
     return ep
 
 
     return ep
 

-
-

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


@@ -596,8 +651,8 @@ if CORE_ONLY:
     BUILD_STC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0
     BUILD_STC = 0
     BUILD_GIZMOS = 0
     BUILD_DLLWIDGET = 0

-    BUILD_IEWIN = 0

     BUILD_ACTIVEX = 0
     BUILD_ACTIVEX = 0

+    BUILD_ANIMATE = 0

 
 if debug:
     FINAL  = 0
 
 if debug:
     FINAL  = 0


@@ -644,7 +699,7 @@ if os.name == 'nt':
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 

-                ('SWIG_GLOBAL', None),
+                ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),

                 ('WXP_USE_THREAD', '1'),
                 ]
 
                 ('WXP_USE_THREAD', '1'),
                 ]
 


@@ -698,7 +753,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
 elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']

-    defines = [('SWIG_GLOBAL', None),
+    defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),

                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]
                ('HAVE_CONFIG_H', None),
                ('WXP_USE_THREAD', '1'),
                ]


@@ -714,6 +769,7 @@ elif os.name == 'posix':
     # uncomment this block to add the right flags to the link step and build
     # again.
     ## if os.uname()[0] == 'SunOS':
     # uncomment this block to add the right flags to the link step and build
     # again.
     ## if os.uname()[0] == 'SunOS':

+    ##     import commands

     ##     libs.append('gcc')
     ##     libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])
 
     ##     libs.append('gcc')
     ##     libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])
 


@@ -800,6 +856,20 @@ VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE,
 # SWIG defaults
 #----------------------------------------------------------------------
 
 # SWIG defaults
 #----------------------------------------------------------------------
 

+# *.i files could live in the wxWidgets/wxPython/src dir, or in 
+# a subdirectory of the devel package. Let's specify both 
+# dirs as includes so we don't have to guess which is correct.
+ 
+wxfilesdir = ""
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
+if os.name != "nt":
+    wxfilesdir = opj(WXPREFIX, i_subdir)
+else:
+    wxfilesdir = opj(WXPY_SRC, i_subdir)
+
+i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
+                     '-I' + wxfilesdir ]
+

 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',
 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',


@@ -810,11 +880,9 @@ swig_args = ['-c++',
              '-keyword',
              '-new_repr',
              '-modern',
              '-keyword',
              '-new_repr',
              '-modern',

-
-             '-I' + opj(WXPY_SRC, 'src'),

              '-D'+WXPLAT,
              '-D'+WXPLAT,

-             '-noruntime'
-             ]
+             ] + i_files_includes
+             

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


@@ -823,10 +891,7 @@ if FULL_DOCS:
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
     
 
 swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),

-              opj(WXPY_SRC, 'src/my_fragments.i'),
-              opj(WXPY_SRC, 'src/common.swg'),
-              opj(WXPY_SRC, 'src/pyrun.swg'),
-              opj(WXPY_SRC, 'src/python.swg'),
+              opj(WXPY_SRC, 'src/pyfragments.swg'),

               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',
               ]
 
 depends = [ #'include/wx/wxPython/wxPython.h',


@@ -840,9 +905,7 @@ depends = [ #'include/wx/wxPython/wxPython.h',
 # BuildRenamers
 ####################################
 
 # BuildRenamers
 ####################################
 

-import pprint
-import xml.sax            
-
+import pprint, shutil

 try:
     import libxml2
     FOUND_LIBXML2 = True
 try:
     import libxml2
     FOUND_LIBXML2 = True


@@ -851,7 +914,6 @@ except ImportError:
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 

-

 renamerTemplateStart = """\
 // A bunch of %rename directives generated by BuildRenamers in config.py
 // in order to remove the wx prefix from all global scope names.
 renamerTemplateStart = """\
 // A bunch of %rename directives generated by BuildRenamers in config.py
 // in order to remove the wx prefix from all global scope names.


@@ -929,11 +991,14 @@ class BuildRenamers:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (pyDest, pyDestTemp)]:
         # blow away the old one if they are different.
         for dest, temp in [(swigDest, swigDestTemp),
                            (pyDest, pyDestTemp)]:

+            # NOTE: we don't use shutil.move() because it was introduced
+            # in Python 2.3. Eventually we can switch to it when people
+            # stop building using 2.2.

             if not os.path.exists(dest):
             if not os.path.exists(dest):

-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)

             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)
             elif open(dest).read() != open(temp).read():
                 os.unlink(dest)

-                os.rename(temp, dest)
+                shutil.copyfile(temp, dest)

             else:
                 print dest + " not changed."
                 os.unlink(temp)
             else:
                 print dest + " not changed."
                 os.unlink(temp)