Allow art provider IDs for the extra bitmaps in a wxBitmapButton. (The

[wxWidgets.git] / wxPython / config.py

diff --git a/wxPython/config.py b/wxPython/config.py
index 86fae489817bdc6450a334bb01a45d986cb28ac5..35032e2fcde24d40df7aacb89ea88dd75c86a0a7 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -37,9 +37,9 @@ import distutils.command.clean
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets
 #----------------------------------------------------------------------
 
 VER_MAJOR        = 2      # The first three must match wxWidgets

-VER_MINOR        = 6
-VER_RELEASE      = 1
-VER_SUBREL       = 1      # wxPython release num for x.y.z release of wxWidgets
+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"
 VER_FLAGS        = "pre"  # release flags, such as prerelease or RC num, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"


@@ -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


@@ -245,7 +260,7 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
               'BUILD_OGL', 'BUILD_STC',     
              'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
              'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
               'BUILD_OGL', 'BUILD_STC',     
              '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:


@@ -255,8 +270,8 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
                 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:


@@ -272,19 +287,23 @@ sys.argv = filter(None, sys.argv)
 # build options file
 #----------------------------------------------------------------------
 
 # 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
 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,
 WX_CONFIG="%s"
 WXPORT="%s"
 MONOLITHIC=%d
 FINAL=%d
 HYBRID=%d
 """ % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,

-       WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
+       EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)

 
 try: 
     from build_options import *
 
 try: 
     from build_options import *


@@ -344,11 +363,6 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
     if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
         os.mkdir(os.path.join(dir, gendir))
 
     if USE_SWIG and not os.path.exists(os.path.join(dir, gendir)):
         os.mkdir(os.path.join(dir, gendir))
 

-    if USE_SWIG and not os.path.exists(os.path.join("docs", "xml-raw")):
-        if not os.path.exists("docs"):
-            os.mkdir("docs")
-        os.mkdir(os.path.join("docs", "xml-raw"))
-

     sources = []
 
     if add_under:  pre = '_'
     sources = []
 
     if add_under:  pre = '_'


@@ -359,7 +373,6 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
         i_file   = os.path.join(dir, file)
         py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
         cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')
         i_file   = os.path.join(dir, file)
         py_file  = os.path.join(dir, gendir, pre+basefile+'.py')
         cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp')

-        xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml')

 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']
 
         if add_under:
             interface = ['-interface', '_'+basefile+'_']


@@ -403,7 +416,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
 
                 # Then run swig for real
                 cmd = [ swig_cmd ] + swig_args + interface + \
 
                 # Then run swig for real
                 cmd = [ swig_cmd ] + swig_args + interface + \

-                      ['-I'+dir, '-o', cpp_file, '-xmlout', xml_file, i_file]
+                      ['-I'+dir, '-o', cpp_file, i_file]

                 msg(' '.join(cmd))
                 spawn(cmd)
 
                 msg(' '.join(cmd))
                 spawn(cmd)
 


@@ -415,6 +428,18 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
     return sources
 
 
     return sources
 
 

+def swig_version():
+    # It may come on either stdout or stderr, depending on the
+    # version, so read both.
+    i, o, e = os.popen3(SWIG + ' -version', 't')
+    stext = o.read() + e.read()
+    import re
+    match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
+    if not match:
+        raise 'NotFound'
+    SVER = match.group(0)
+    return SVER
+

 
 # Specializations of some distutils command classes
 class wx_smart_install_data(distutils.command.install_data.install_data):
 
 # Specializations of some distutils command classes
 class wx_smart_install_data(distutils.command.install_data.install_data):


@@ -681,6 +706,7 @@ if os.name == 'nt':
                 ('WXUSINGDLL', '1'),
 
                 ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
                 ('WXUSINGDLL', '1'),
 
                 ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),

+                ('SWIG_PYTHON_OUTPUT_TUPLE', None),

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


@@ -693,6 +719,9 @@ if os.name == 'nt':
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 

+    if UNICODE:
+        defines.append( ('wxUSE_UNICODE', 1) )
+

     libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]
     if MONOLITHIC:
         libs = makeLibName('')
     libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]
     if MONOLITHIC:
         libs = makeLibName('')


@@ -735,7 +764,7 @@ elif os.name == 'posix':
     WXDIR = '..'
     includes = ['include', 'src']
     defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
     WXDIR = '..'
     includes = ['include', 'src']
     defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),

-               ('HAVE_CONFIG_H', None),
+               ('SWIG_PYTHON_OUTPUT_TUPLE', None),

                ('WXP_USE_THREAD', '1'),
                ]
     if UNDEF_NDEBUG:
                ('WXP_USE_THREAD', '1'),
                ]
     if UNDEF_NDEBUG:


@@ -854,15 +883,22 @@ i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',
 swig_cmd = SWIG
 swig_force = force
 swig_args = ['-c++',

-             '-Wall',
-             '-nodefault',
-
+             #'-Wall',

              '-python',
              '-python',

-             '-keyword',

              '-new_repr',
              '-modern',
              '-D'+WXPLAT,
              ] + i_files_includes
              '-new_repr',
              '-modern',
              '-D'+WXPLAT,
              ] + i_files_includes

+
+if USE_SWIG:
+    SVER = swig_version()
+    if int(SVER[-2:]) >= 29:
+        swig_args += [ '-fastdispatch',
+                       '-fvirtual',
+                       '-fastinit',
+                       '-fastunpack',
+                       #'-outputtuple',  Currently setting this with a -D define above
+                       ]

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


@@ -1009,7 +1045,6 @@ class BuildRenamers:
         # do a depth first iteration over what's left
         for node in topnode:
             doRename = False
         # do a depth first iteration over what's left
         for node in topnode:
             doRename = False

-            doPtr = False

             addWX = False
             revOnly = False
     
             addWX = False
             revOnly = False
     


@@ -1018,7 +1053,6 @@ class BuildRenamers:
                 lastClassName = name = self.GetAttr(node, "name")
                 lastClassSymName = sym_name = self.GetAttr(node, "sym_name")
                 doRename = True
                 lastClassName = name = self.GetAttr(node, "name")
                 lastClassSymName = sym_name = self.GetAttr(node, "sym_name")
                 doRename = True

-                doPtr = True

                 if sym_name != name:
                     name = sym_name
                     addWX = True
                 if sym_name != name:
                     name = sym_name
                     addWX = True


@@ -1076,8 +1110,6 @@ class BuildRenamers:
                 if addWX and not old.startswith('wx'):
                     old = 'wx'+old
                 pyFile.write("%s = wx.%s.%s\n" % (old, modname, new))
                 if addWX and not old.startswith('wx'):
                     old = 'wx'+old
                 pyFile.write("%s = wx.%s.%s\n" % (old, modname, new))

-                if doPtr:
-                    pyFile.write("%sPtr = wx.%s.%sPtr\n" % (old, modname, new))

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