]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/setup.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
changed PPC struct alignement setting
[wxWidgets.git] / wxPython / setup.py
diff --git a/wxPython/setup.py b/wxPython/setup.py
index b1788a4661d17dd136b70fb5def08fae03319712..aa2c33fd9f373cdae0ae78db447f3024f8e26b03 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.2b3"
+VERSION          = "2.3.3"
 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,11 +31,15 @@ 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_XRC = 1      # XML based resource system
+BUILD_GIZMOS = 1   # Build a module for the gizmos contrib library
+BUILD_DLLWIDGET = 1# Build a module for the gizmos contrib library
 
 
+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
 
 GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
                    # for the ugly details
 
@@ -64,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.)
 
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 
-WXDLLVER = '23_2'  # Version part of DLL name
+WXDLLVER = '233'   # Version part of DLL name
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
@@ -77,6 +81,15 @@ def opj(*args):
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 
+def libFlag():
+    if FINAL:
+        return ''
+    elif HYBRID:
+        return 'h'
+    else:
+        return 'd'
+
+
 #----------------------------------------------------------------------
 # Some other globals
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Some other globals
 #----------------------------------------------------------------------
@@ -102,6 +115,7 @@ 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',
+             'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
              'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
              'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
              'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
@@ -127,6 +141,9 @@ if CORE_ONLY:
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
+    BUILD_GIZMOS = 0
+    BUILD_DLLWIDGET = 0
+
 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
@@ -148,6 +165,7 @@ if os.name == 'nt':
         FINAL = 0
 
     includes = ['src',
         FINAL = 0
 
     includes = ['src',
+                opj(WXDIR, 'lib', 'mswdll' + libFlag()),
                 opj(WXDIR, 'include'),
                 ]
 
                 opj(WXDIR, 'include'),
                 ]
 
@@ -188,16 +206,9 @@ if os.name == 'nt':
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
-
-    if FINAL:
-        wxdll = 'wx' + WXDLLVER
-    elif HYBRID:
-        wxdll = 'wx' + WXDLLVER + 'h'
-    else:
-        wxdll = 'wx' + WXDLLVER + 'd'
-
-
+    wxdll = 'wxmsw' + WXDLLVER + libFlag()
     libs = [wxdll]
     libs = [wxdll]
+
     if bcpp_compiling:
         libs = ['wx'+WXBCPPLIBVER]
 
     if bcpp_compiling:
         libs = ['wx'+WXBCPPLIBVER]
 
@@ -212,7 +223,7 @@ if os.name == 'nt':
 
 
     if bcpp_compiling:  # overwrite it
 
 
     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')
@@ -229,6 +240,29 @@ if os.name == 'nt':
 
 
 
 
 
 
+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
+    WXPLAT = '__WXMAC__'
+    GENDIR = 'mac'
+
+    includes = ['src']
+    defines = [('SWIG_GLOBAL', None),
+               ('HAVE_CONFIG_H', None),
+               ('WXP_USE_THREAD', '1'),
+               ]
+    libdirs = []
+    libs = []
+
+    cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
+    cflags = string.split(cflags)
+
+    lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+    lflags = string.split(lflags)
+
+
+
 elif os.name == 'posix':
     # Set flags for Unix type platforms
 
 elif os.name == 'posix':
     # Set flags for Unix type platforms
 
@@ -244,7 +278,7 @@ elif os.name == 'posix':
     libdirs = []
     libs = []
 
     libdirs = []
     libs = []
 
-    cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+    cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
              os.popen('gtk-config --cflags', 'r').read()[:-1]
     cflags = string.split(cflags)
 
              os.popen('gtk-config --cflags', 'r').read()[:-1]
     cflags = string.split(cflags)
 
@@ -274,7 +308,8 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword',
              '-dnone',
              #'-dascii',
              #'-docstring', '-Sbefore',
              '-dnone',
              #'-dascii',
              #'-docstring', '-Sbefore',
-             '-I./src', '-D'+WXPLAT]
+             '-I./src', '-D'+WXPLAT,
+             ]
 swig_deps = ['src/my_typemaps.i']
 
 
 swig_deps = ['src/my_typemaps.i']
 
 
@@ -415,14 +450,13 @@ if BUILD_GLCANVAS or GL_ONLY:
 
     gl_libs = []
     if os.name == 'posix':
 
     gl_libs = []
     if os.name == 'posix':
-        if '-D__WXDEBUG__' in cflags:
-            gl_libs = ['wx_gtkd_gl', 'GL', 'GLU']
-        else:
-            gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
+        gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1]
+        gl_lflags = string.split(gl_config) + lflags
+        gl_libs = libs
     else:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
     else:
         other_sources = [opj(location, 'msw/myglcanvas.cpp')]
-        gl_libs = ['opengl32', 'glu32']
-
+        gl_libs = libs + ['opengl32', 'glu32']
+        gl_lflags = lflags
 
     ext = Extension('glcanvasc',
                     swig_sources + other_sources,
 
     ext = Extension('glcanvasc',
                     swig_sources + other_sources,
@@ -431,10 +465,10 @@ if BUILD_GLCANVAS or GL_ONLY:
                     define_macros = defines,
 
                     library_dirs = libdirs,
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + gl_libs,
+                    libraries = gl_libs,
 
                     extra_compile_args = cflags,
 
                     extra_compile_args = cflags,
-                    extra_link_args = lflags,
+                    extra_link_args = gl_lflags,
                     )
 
     wxpExtensions.append(ext)
                     )
 
     wxpExtensions.append(ext)
@@ -521,12 +555,12 @@ if not GL_ONLY and BUILD_STC:
 
 
     swig_files = ['stc_.i']
 
 
     swig_files = ['stc_.i']
-    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+    swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
                             [opj(STC_H, 'stc.h')])
 
                             USE_SWIG, swig_force,
                             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
@@ -557,14 +591,16 @@ if not GL_ONLY and BUILD_STC:
                      '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.cxx' % STCLOC,
                      '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.cxx' % STCLOC,
+                     '%s/scintilla/src/StyleContext.cxx' % STCLOC,
                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
 
                      '%s/scintilla/src/LexAda.cxx' % STCLOC,
                      '%s/scintilla/src/LexAVE.cxx' % STCLOC,
                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
 
                      '%s/scintilla/src/LexAda.cxx' % STCLOC,
                      '%s/scintilla/src/LexAVE.cxx' % STCLOC,
-                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,
                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,
+                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
+                     '%s/scintilla/src/LexCrontab.cxx' % STCLOC,
                      '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
                      '%s/scintilla/src/LexLisp.cxx' % STCLOC,
                      '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
                      '%s/scintilla/src/LexLisp.cxx' % STCLOC,
@@ -718,6 +754,98 @@ if not GL_ONLY and BUILD_XRC:
 
 
 
 
 
 
+#----------------------------------------------------------------------
+# Define the GIZMOS  extension module
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_GIZMOS:
+    msg('Preparing GIZMOS...')
+    location = 'contrib/gizmos'
+    GIZMOLOC = opj(location, 'contrib/src/gizmos')
+    GIZMOINC = opj(location, 'contrib/include')
+
+    swig_files = ['gizmos.i']
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args)
+
+    gizmos_includes = includes[:]
+    gizmos_includes.append(GIZMOINC)
+
+
+    # make sure local copy of contrib files are up to date
+    if IN_CVS_TREE:
+        contrib_copy_tree(opj(CTRB_INC, 'gizmos'), opj(GIZMOINC, 'wx/gizmos'))
+        contrib_copy_tree(opj(CTRB_SRC, 'gizmos'), GIZMOLOC)
+
+    ext = Extension('gizmosc', [
+                                '%s/dynamicsash.cpp' % GIZMOLOC,
+                                '%s/editlbox.cpp' % GIZMOLOC,
+                                #'%s/multicell.cpp' % GIZMOLOC,
+                                '%s/splittree.cpp' % GIZMOLOC,
+                                '%s/ledctrl.cpp'   % GIZMOLOC,
+                             ] + swig_sources,
+
+                    include_dirs =  gizmos_includes,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+
+
+#----------------------------------------------------------------------
+# 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
@@ -737,11 +865,14 @@ 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,
+
+              ##data_files = TOOLS,
               )
 
     else:
               )
 
     else:
@@ -758,6 +889,7 @@ if __name__ == "__main__":
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
 
               ext_package = PKGDIR,
               ext_modules = wxpExtensions,
+
               )
 
 
               )
 
 
wxWidgets (Impactor)