X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f221f8eb3a14391fc7182e6dd56a13c664d3d76e..59840ba3b16e4baf3228dd79c6b7ae40b55cf488:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 5633a0366e..28ed092872 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -1,7 +1,7 @@
 #!/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
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2"
+VERSION          = "2.3.3rc"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
@@ -68,7 +68,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.)
 
-WXDLLVER = '232'   # Version part of DLL name
+WXDLLVER = '233'   # Version part of DLL name
 
 
 #----------------------------------------------------------------------
@@ -218,7 +218,9 @@ if os.name == 'nt':
             '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
 
 
@@ -323,8 +325,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',
-                   '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,
@@ -390,20 +391,6 @@ if not GL_ONLY:
     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)
@@ -705,6 +692,7 @@ if not GL_ONLY and BUILD_XRC:
                                 '%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,
@@ -730,13 +718,8 @@ if not GL_ONLY and BUILD_XRC:
 
                                 '%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/xmlwrite.cpp' % XMLLOC,
 
                              ] + swig_sources,
 
@@ -832,6 +815,19 @@ if not GL_ONLY and BUILD_DLLWIDGET:
     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"]),
+         ]
+
+
 
 
 #----------------------------------------------------------------------
@@ -858,6 +854,8 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
+
+              ##data_files = TOOLS,
               )
 
     else:
@@ -874,6 +872,7 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
+
               )