]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/setup.py
Fixed compile errors, warnings and other DSMs, and improved comments.
[wxWidgets.git] / wxPython / setup.py
index d3fdd3e56e5d7f0fbc43ce9625c51988f9782dee..74616671ea5ebe0d5a5e218c9d2df663ab289657 100755 (executable)
@@ -13,10 +13,10 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3b3"
+VERSION          = "2.3.2b5"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
-AUTHOR_EMAIL     = "robin@alldunn.com"
+AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 URL              = "http://wxPython.org/"
 LICENCE          = "wxWindows (LGPL derivative)"
 LONG_DESCRIPTION = """\
@@ -31,6 +31,10 @@ 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_IEWIN = 0    # Internet Explorer wrapper (experimental)
+BUILD_XRC = 1      # XML based resource system
+
+
 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
@@ -60,8 +64,18 @@ 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 = '23_0'  # Version part of DLL name
+WXDLLVER = '23_2'  # Version part of DLL name
+
+
+#----------------------------------------------------------------------
+
+def msg(text):
+    if __name__ == "__main__":
+        print text
 
+def opj(*args):
+    path = apply(os.path.join, args)
+    return os.path.normpath(path)
 
 #----------------------------------------------------------------------
 # Some other globals
@@ -76,7 +90,7 @@ debug = '--debug' in sys.argv or '-g' in sys.argv
 bcpp_compiling = '-c' in sys.argv and 'my_bcpp' in sys.argv # Bad heuristic
 
 if bcpp_compiling:
-    print "Compiling wxPython by Borland C/C++ Compiler"
+    msg("Compiling wxPython by Borland C/C++ Compiler")
     HYBRID=0
     WXBCPPLIBVER = string.replace(WXDLLVER,"_","")
     # Version part of BCPP build LIBRARY name
@@ -87,8 +101,9 @@ if bcpp_compiling:
 # Check for build flags on the command line
 #----------------------------------------------------------------------
 
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY',
-             'USE_SWIG', 'IN_CVS_TREE', 'FINAL', 'HYBRID', ]:
+for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
+             'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
+             'FINAL', 'HYBRID', ]:
     for x in range(len(sys.argv)):
         if string.find(sys.argv[x], flag) == 0:
             pos = string.find(sys.argv[x], '=') + 1
@@ -111,6 +126,7 @@ if CORE_ONLY:
     BUILD_GLCANVAS = 0
     BUILD_OGL = 0
     BUILD_STC = 0
+    BUILD_XRC = 0
 
 #----------------------------------------------------------------------
 # Setup some platform specific stuff
@@ -132,7 +148,7 @@ if os.name == 'nt':
         FINAL = 0
 
     includes = ['src',
-                os.path.join(WXDIR, 'include'),
+                opj(WXDIR, 'include'),
                 ]
 
     defines = [ ('WIN32', None),        # Some of these are no longer
@@ -171,7 +187,7 @@ if os.name == 'nt':
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
-    libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib']
+    libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
 
     if FINAL:
         wxdll = 'wx' + WXDLLVER
@@ -191,15 +207,15 @@ if os.name == 'nt':
             'advapi32', 'wsock32']
 
 
-    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC 5
+    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC on some machines
     lflags = None
 
 
     if bcpp_compiling:  # overwrite it
         cflags = ['-5', '-VF',  ### To supplort MSVC spurious semicolons in the class scope
                   ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
-                  '-Hc', '-H='+WXDIR+'\src\msw\wx32.csm',
-                  '@'+WXDIR+'\src\msw\wxwin32.cfg'
+                  '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
+                  '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
                   ]
 
 
@@ -254,7 +270,10 @@ if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
 #----------------------------------------------------------------------
 
 swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii',
+swig_args = ['-c++', '-shadow', '-python', '-keyword',
+             '-dnone',
+             #'-dascii',
+             #'-docstring', '-Sbefore',
              '-I./src', '-D'+WXPLAT]
 swig_deps = ['src/my_typemaps.i']
 
@@ -264,7 +283,7 @@ swig_deps = ['src/my_typemaps.i']
 #----------------------------------------------------------------------
 
 if not GL_ONLY:
-    print 'Preparing CORE...'
+    msg('Preparing CORE...')
     swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
@@ -283,7 +302,7 @@ if not GL_ONLY:
     if IN_CVS_TREE:   # update the licence files
         mkpath('licence')
         for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
-            copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0)
+            copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
 
 
     if os.name == 'nt':
@@ -364,12 +383,29 @@ if not GL_ONLY:
     wxpExtensions.append(ext)
 
 
+    # Extension for the help module
+    swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR,
+                            USE_SWIG, swig_force, swig_args, swig_deps)
+    ext = Extension('helpc', swig_sources,
+                    include_dirs =  includes,
+                    define_macros = defines,
+                    library_dirs = libdirs,
+                    libraries = libs,
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+    wxpExtensions.append(ext)
+
+
 #----------------------------------------------------------------------
 # Define the GLCanvas extension module
 #----------------------------------------------------------------------
 
+CTRB_SRC =  opj(WXDIR, 'contrib/src')
+CTRB_INC =  opj(WXDIR, 'contrib/include/wx')
+
 if BUILD_GLCANVAS or GL_ONLY:
-    print 'Preparing GLCANVAS...'
+    msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
     swig_files = ['glcanvas.i']
     other_sources = []
@@ -379,14 +415,13 @@ if BUILD_GLCANVAS or GL_ONLY:
 
     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 = [location + '/msw/myglcanvas.cpp']
-        gl_libs = ['opengl32', 'glu32']
-
+        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
+        gl_libs = libs + ['opengl32', 'glu32']
+        gl_lflags = lflags
 
     ext = Extension('glcanvasc',
                     swig_sources + other_sources,
@@ -395,10 +430,10 @@ if BUILD_GLCANVAS or GL_ONLY:
                     define_macros = defines,
 
                     library_dirs = libdirs,
-                    libraries = libs + gl_libs,
+                    libraries = gl_libs,
 
                     extra_compile_args = cflags,
-                    extra_link_args = lflags,
+                    extra_link_args = gl_lflags,
                     )
 
     wxpExtensions.append(ext)
@@ -409,10 +444,10 @@ if BUILD_GLCANVAS or GL_ONLY:
 #----------------------------------------------------------------------
 
 if not GL_ONLY and BUILD_OGL:
-    print 'Preparing OGL...'
+    msg('Preparing OGL...')
     location = 'contrib/ogl'
-    OGLLOC = location + '/contrib/src/ogl'
-    OGLINC = location + '/contrib/include'
+    OGLLOC = opj(location, 'contrib/src/ogl')
+    OGLINC = opj(location, 'contrib/include')
 
     swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
                   'oglcanvas.i']
@@ -420,10 +455,10 @@ if not GL_ONLY and BUILD_OGL:
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
                             USE_SWIG, swig_force, swig_args)
 
-    # make sure local copy of contrib files are up to date
     if IN_CVS_TREE:
-        contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl')
-        contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC)
+        # make sure local copy of contrib files are up to date
+        contrib_copy_tree(opj(CTRB_INC, 'ogl'), opj(OGLINC, 'wx/ogl'))
+        contrib_copy_tree(opj(CTRB_SRC, 'ogl'), OGLLOC)
 
     ext = Extension('oglc', ['%s/basic.cpp' % OGLLOC,
                              '%s/bmpshape.cpp' % OGLLOC,
@@ -458,26 +493,40 @@ if not GL_ONLY and BUILD_OGL:
 #----------------------------------------------------------------------
 
 if not GL_ONLY and BUILD_STC:
-    print 'Preparing STC...'
+    msg('Preparing STC...')
     location = 'contrib/stc'
-    STCLOC = location + '/contrib/src/stc'
-    STCINC = location + '/contrib/include'
-    STC_H =  location + '/contrib/include/wx/stc'
+    STCLOC = opj(location, 'contrib/src/stc')
+    STCINC = opj(location, 'contrib/include')
+    STC_H =  opj(location, 'contrib/include/wx/stc')
 
-    # make sure local copy of contrib files are up to date
     if IN_CVS_TREE:
-        contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc')
-        contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC)
+        # Check if gen_iface needs to be run for the wxSTC sources
+        if (newer(opj(CTRB_SRC, 'stc/stc.h.in'),     opj(CTRB_INC, 'stc/stc.h'  )) or
+            newer(opj(CTRB_SRC, 'stc/stc.cpp.in'),   opj(CTRB_SRC, 'stc/stc.cpp')) or
+            newer(opj(CTRB_SRC, 'stc/gen_iface.py'), opj(CTRB_SRC, 'stc/stc.cpp'))):
+
+            msg('Running gen_iface.py, regenerating stc.h and stc.cpp...')
+            cwd = os.getcwd()
+            os.chdir(opj(CTRB_SRC, 'stc'))
+            import gen_iface
+            gen_iface.main([])
+            os.chdir(cwd)
+
+
+        # make sure local copy of contrib files are up to date
+        contrib_copy_tree(opj(CTRB_INC, 'stc'), opj(STCINC, 'wx/stc'))
+        contrib_copy_tree(opj(CTRB_SRC, 'stc'), STCLOC)
+
 
 
     swig_files = ['stc_.i']
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
-                            [STC_H+'/stc.h'])
+                            [opj(STC_H, 'stc.h')])
 
     # copy a project specific py module to the main package dir
-    copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)
+    copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
 
     # add some include dirs to the standard set
     stc_includes = includes[:]
@@ -497,27 +546,35 @@ if not GL_ONLY and BUILD_STC:
                      '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
                      '%s/scintilla/src/ContractionState.cxx' % STCLOC,
                      '%s/scintilla/src/Document.cxx' % STCLOC,
+                     '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
                      '%s/scintilla/src/Editor.cxx' % STCLOC,
                      '%s/scintilla/src/Indicator.cxx' % STCLOC,
                      '%s/scintilla/src/KeyMap.cxx' % STCLOC,
                      '%s/scintilla/src/KeyWords.cxx' % STCLOC,
                      '%s/scintilla/src/LineMarker.cxx' % STCLOC,
                      '%s/scintilla/src/PropSet.cxx' % STCLOC,
+                     '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.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/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
+                     '%s/scintilla/src/LexLisp.cxx' % STCLOC,
                      '%s/scintilla/src/LexLua.cxx' % STCLOC,
                      '%s/scintilla/src/LexOthers.cxx' % STCLOC,
+                     '%s/scintilla/src/LexPascal.cxx' % STCLOC,
                      '%s/scintilla/src/LexPerl.cxx' % STCLOC,
                      '%s/scintilla/src/LexPython.cxx' % STCLOC,
+                     '%s/scintilla/src/LexRuby.cxx' % STCLOC,
                      '%s/scintilla/src/LexSQL.cxx' % STCLOC,
                      '%s/scintilla/src/LexVB.cxx' % STCLOC,
-                     '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
-                     '%s/scintilla/src/UniConversion.cxx' % STCLOC,
-                     '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
-                     '%s/scintilla/src/PosRegExp.cxx' % STCLOC,
 
                      '%s/PlatWX.cpp' % STCLOC,
                      '%s/ScintillaWX.cpp' % STCLOC,
@@ -538,6 +595,129 @@ if not GL_ONLY and BUILD_STC:
 
 
 
+#----------------------------------------------------------------------
+# Define the IEWIN extension module (experimental)
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_IEWIN:
+    msg('Preparing IEWIN...')
+    location = 'contrib/iewin'
+
+    swig_files = ['iewin.i', ]
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args)
+
+
+    ext = Extension('iewinc', ['%s/IEHtmlWin.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)
+
+
+#----------------------------------------------------------------------
+# Define the XRC extension module
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_XRC:
+    msg('Preparing XRC...')
+    location = 'contrib/xrc'
+    XMLLOC = opj(location, 'contrib/src/xrc')
+    XMLINC = opj(location, 'contrib/include')
+
+    swig_files = ['xrc.i']
+
+    swig_sources = run_swig(swig_files, location, '', PKGDIR,
+                            USE_SWIG, swig_force, swig_args)
+
+    xmlres_includes = includes[:]
+    xmlres_includes.append('%s/expat/xmlparse' % XMLLOC)
+    xmlres_includes.append('%s/expat/xmltok' % XMLLOC)
+    xmlres_includes.append(XMLINC)
+
+
+    # make sure local copy of contrib files are up to date
+    if IN_CVS_TREE:
+        contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc'))
+        contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC)
+
+    ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
+                                '%s/expat/xmltok/xmlrole.c' % XMLLOC,
+                                '%s/expat/xmltok/xmltok.c' % XMLLOC,
+
+                                '%s/xh_bmp.cpp' % XMLLOC,
+                                '%s/xh_bmpbt.cpp' % XMLLOC,
+                                '%s/xh_bttn.cpp' % XMLLOC,
+                                '%s/xh_cald.cpp' % XMLLOC,
+                                '%s/xh_chckb.cpp' % XMLLOC,
+
+                                '%s/xh_chckl.cpp' % XMLLOC,
+                                '%s/xh_choic.cpp' % XMLLOC,
+                                '%s/xh_combo.cpp' % XMLLOC,
+                                '%s/xh_dlg.cpp' % XMLLOC,
+                                '%s/xh_frame.cpp' % XMLLOC,
+
+                                '%s/xh_gauge.cpp' % XMLLOC,
+                                '%s/xh_html.cpp' % XMLLOC,
+                                '%s/xh_listb.cpp' % XMLLOC,
+                                '%s/xh_listc.cpp' % XMLLOC,
+                                '%s/xh_menu.cpp' % XMLLOC,
+
+                                '%s/xh_notbk.cpp' % XMLLOC,
+                                '%s/xh_panel.cpp' % XMLLOC,
+                                '%s/xh_radbt.cpp' % XMLLOC,
+                                '%s/xh_radbx.cpp' % XMLLOC,
+                                '%s/xh_scrol.cpp' % XMLLOC,
+
+                                '%s/xh_sizer.cpp' % XMLLOC,
+                                '%s/xh_slidr.cpp' % XMLLOC,
+                                '%s/xh_spin.cpp' % XMLLOC,
+                                '%s/xh_stbmp.cpp' % XMLLOC,
+                                '%s/xh_stbox.cpp' % XMLLOC,
+
+                                '%s/xh_stlin.cpp' % XMLLOC,
+                                '%s/xh_sttxt.cpp' % XMLLOC,
+                                '%s/xh_text.cpp' % XMLLOC,
+                                '%s/xh_toolb.cpp' % XMLLOC,
+                                '%s/xh_tree.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/xmlwrite.cpp' % XMLLOC,
+
+                             ] + swig_sources,
+
+                    include_dirs =  xmlres_includes,
+                    define_macros = defines,
+
+                    library_dirs = libdirs,
+                    libraries = libs,
+
+                    extra_compile_args = cflags,
+                    extra_link_args = lflags,
+                    )
+
+    wxpExtensions.append(ext)
+
+
+
+
 #----------------------------------------------------------------------
 # Do the Setup/Build/Install/Whatever
 #----------------------------------------------------------------------
@@ -556,6 +736,7 @@ if __name__ == "__main__":
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',
+                          PKGDIR+'.lib.mixins'
                           ],
 
               ext_package = PKGDIR,