X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e7ecb7be084f5815051682b2a5809090ebb2706..8ac67aa10207821a237a18da17f5d25f57f1e9ff:/wxPython/setup.py?ds=sidebyside diff --git a/wxPython/setup.py b/wxPython/setup.py index 64f8b24969..b96641acd5 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,16 +13,16 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3b2" +VERSION = "2.3.3pre4" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" -AUTHOR_EMAIL = "robin@alldunn.com" +AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" LICENCE = "wxWindows (LGPL derivative)" LONG_DESCRIPTION = """\ wxPython is a GUI toolkit for Python that is a wrapper around the wxWindows C++ GUI library. wxPython provides a large variety of -window types and controls, all imlemented with a native look and +window types and controls, all implemented with a native look and feel (and native runtime speed) on the platforms it is supported on. """ @@ -31,15 +31,45 @@ 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_XRC = 1 # XML based resource system +BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library +BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets + # to be loaded from a DLL and to be used from Python. + +BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental) + 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 + USE_SWIG = 0 # Should we actually execute SWIG, or just use the # files already in the distribution? +UNICODE = 0 # This will pass the 'wxUSE_UNICODE' flag to SWIG and + # will ensure that the right headers are found and the + # right libs are linked. + IN_CVS_TREE = 0 # Set to true if building in a full wxWindows CVS # tree, otherwise will assume all needed files are # available in the wxPython source distribution +UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by default defines NDEBUG, + # and distutils will pick this up and use it on the + # compile command-line for the extensions. This could + # conflict with how wxWindows was built. If NDEBUG is + # set then wxWindows' __WXDEBUG__ setting will be turned + # off. If wxWindows was actually built with it turned + # on then you end up with mismatched class structures, + # and wxPython will crash. + +WX_CONFIG = "wx-config" # 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. + +BUILD_BASE = "build" # Some MSW build settings @@ -54,7 +84,31 @@ 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 = '233' # Version part of wxWindows DLL name + + +#---------------------------------------------------------------------- + +def msg(text): + if __name__ == "__main__": + print text + + +def opj(*args): + path = apply(os.path.join, args) + return os.path.normpath(path) + + +def libFlag(): + if FINAL: + rv = '' + elif HYBRID: + rv = 'h' + else: + rv = 'd' + if UNICODE: + rv = 'u' + rv + return rv #---------------------------------------------------------------------- @@ -67,14 +121,25 @@ wxpExtensions = [] force = '--force' in sys.argv or '-f' in sys.argv 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: + msg("Compiling wxPython by Borland C/C++ Compiler") + HYBRID=0 + WXBCPPLIBVER = string.replace(WXDLLVER,"_","") + # Version part of BCPP build LIBRARY name + WXDLLVER="" # no dll ver path avaible + #---------------------------------------------------------------------- # 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', - 'WXDLLVER', ]: +# Boolean (int) flags +for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', + 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', + 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG', + 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): if string.find(sys.argv[x], flag) == 0: pos = string.find(sys.argv[x], '=') + 1 @@ -82,13 +147,40 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'CORE_ONLY', vars()[flag] = eval(sys.argv[x][pos:]) sys.argv[x] = '' +# String options +for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE']: + for x in range(len(sys.argv)): + if string.find(sys.argv[x], option) == 0: + pos = string.find(sys.argv[x], '=') + 1 + if pos > 0: + vars()[option] = sys.argv[x][pos:] + sys.argv[x] = '' + sys.argv = filter(None, sys.argv) + +#---------------------------------------------------------------------- +# sanity checks + if CORE_ONLY: BUILD_GLCANVAS = 0 BUILD_OGL = 0 BUILD_STC = 0 + BUILD_XRC = 0 + BUILD_GIZMOS = 0 + BUILD_DLLWIDGET = 0 + + +if UNICODE and os.name != 'nt': + print "UNICODE is currently only supported on Win32" + sys.exit() + + +if UNICODE: + BUILD_BASE = BUILD_BASE + '.unicode' + VERSION = VERSION + 'u' + #---------------------------------------------------------------------- # Setup some platform specific stuff @@ -96,9 +188,13 @@ if CORE_ONLY: if os.name == 'nt': # Set compile flags and such for MSVC. These values are derived - # from the wxWindows makefiles for MSVC, others will probably - # vary... - WXDIR = os.environ['WXWIN'] + # from the wxWindows makefiles for MSVC, other compilers settings + # will probably vary... + if os.environ.has_key('WXWIN'): + WXDIR = os.environ['WXWIN'] + else: + msg("WARNING: WXWIN not set in environment.") + WXDIR = '..' # assumes in CVS tree WXPLAT = '__WXMSW__' GENDIR = 'msw' @@ -110,7 +206,8 @@ if os.name == 'nt': FINAL = 0 includes = ['src', - os.path.join(WXDIR, 'include'), + opj(WXDIR, 'lib', 'mswdll' + libFlag()), + opj(WXDIR, 'include'), ] defines = [ ('WIN32', None), # Some of these are no longer @@ -129,31 +226,87 @@ if os.name == 'nt': ('WXP_USE_THREAD', '1'), ] + if bcpp_compiling: # overwrite it + defines = [ + ('_WINDOWS', None), + ('WINVER', '0x0400'), + ('STRICT', None), + + ('WXUSINGDLL', '1'), + + ('SWIG_GLOBAL', None), + ('HAVE_CONFIG_H', None), + ('WXP_USE_THREAD', '1'), + + ('WXUSE_DEFINE','1'), + ('_RTLDLL',None), + ] + + if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib'] - - if FINAL: - wxdll = 'wx' + WXDLLVER - elif HYBRID: - wxdll = 'wx' + WXDLLVER + 'h' - else: - wxdll = 'wx' + WXDLLVER + 'd' + libdirs = [opj(WXDIR, 'lib'), 'build\\ilib'] + wxdll = 'wxmsw' + WXDLLVER + libFlag() + libs = [wxdll] + if bcpp_compiling: + libs = ['wx'+WXBCPPLIBVER] - libs = [wxdll, 'kernel32', 'user32', 'gdi32', 'comdlg32', + libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32', 'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32', 'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4', '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 not FINAL and HYBRID: + + if bcpp_compiling: # overwrite it + 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') + ] + + + if not FINAL and HYBRID and not bcpp_compiling: cflags = cflags + ['/Od', '/Z7'] lflags = ['/DEBUG', ] + elif bcpp_compiling and not FINAL: + cflags = cflags + ['/Od', '/v', '/y'] + lflags = lflags + ['/v', ] + + + +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) + if UNDEF_NDEBUG: + cflags.append('-UNDEBUG') + + lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] + lflags = string.split(lflags) + + elif os.name == 'posix': # Set flags for Unix type platforms @@ -170,11 +323,13 @@ elif os.name == 'posix': 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) + if UNDEF_NDEBUG: + cflags.append('-UNDEBUG') - lflags = os.popen('wx-config --libs', 'r').read()[:-1] + lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] lflags = string.split(lflags) @@ -186,148 +341,169 @@ else: # Check if the version file needs updated #---------------------------------------------------------------------- -if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'): - open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) +#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'): +open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) + + #---------------------------------------------------------------------- -# Define the CORE extension module +# SWIG defaults #---------------------------------------------------------------------- -print 'Preparing CORE...' swig_force = force -swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii', - '-I./src', '-D'+WXPLAT] +swig_args = ['-c++', '-shadow', '-python', '-keyword', + '-dnone', + #'-dascii', + #'-docstring', '-Sbefore', + '-I./src', '-D'+WXPLAT, + ] +if UNICODE: + swig_args.append('-DwxUSE_UNICODE') + swig_deps = ['src/my_typemaps.i'] -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', - 'printfw.i', 'sizers.i', 'clip_dnd.i', - 'filesys.i', 'streams.i', -# 'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i', - ] -swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) +#---------------------------------------------------------------------- +# Define the CORE extension module +#---------------------------------------------------------------------- + +if not GL_ONLY: + 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', + 'printfw.i', 'sizers.i', 'clip_dnd.i', + 'filesys.i', 'streams.i', 'utils.i', 'fonts.i' + ] -copy_file('src/__init__.py', PKGDIR, update=1, verbose=0) -copy_file('src/__version__.py', PKGDIR, update=1, verbose=0) + swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) + copy_file('src/__init__.py', PKGDIR, update=1, verbose=0) + copy_file('src/__version__.py', PKGDIR, update=1, verbose=0) + copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0) -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) + if IN_CVS_TREE: # update the licence files + mkpath('licence') + for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']: + copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0) -if os.name == 'nt': - rc_file = ['src/wxc.rc'] -else: - rc_file = [] - - -ext = Extension('wxc', ['src/helpers.cpp', - 'src/libpy.c', - ] + rc_file + 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 grid module -swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) -ext = Extension('gridc', 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 html modules -swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) -ext = Extension('htmlc', 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 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) -ext = Extension('calendarc', swig_sources, - include_dirs = includes, - define_macros = defines, - library_dirs = libdirs, - libraries = libs, - extra_compile_args = cflags, - extra_link_args = lflags, - ) -wxpExtensions.append(ext) + if os.name == 'nt': + rc_file = ['src/wxc.rc'] + else: + rc_file = [] + + + ext = Extension('wxc', ['src/helpers.cpp', + 'src/libpy.c', + ] + rc_file + 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 grid module + swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) + ext = Extension('gridc', 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 html modules + swig_sources = run_swig(['html.i', 'htmlhelp.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) + ext = Extension('htmlc', 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) + ext = Extension('calendarc', 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 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 #---------------------------------------------------------------------- -if BUILD_GLCANVAS: - print 'Preparing GLCANVAS...' +CTRB_SRC = opj(WXDIR, 'contrib/src') +CTRB_INC = opj(WXDIR, 'contrib/include/wx') + +if BUILD_GLCANVAS or GL_ONLY: + msg('Preparing GLCANVAS...') location = 'contrib/glcanvas' swig_files = ['glcanvas.i'] + other_sources = [] swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args) + USE_SWIG, swig_force, swig_args, swig_deps) 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')] + gl_libs = libs + ['opengl32', 'glu32'] + gl_lflags = lflags ext = Extension('glcanvasc', - swig_sources, + swig_sources + other_sources, include_dirs = includes, 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) @@ -337,23 +513,22 @@ if BUILD_GLCANVAS: # Define the OGL extension module #---------------------------------------------------------------------- - -if BUILD_OGL: - print 'Preparing OGL...' +if not GL_ONLY and BUILD_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'] swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args) + USE_SWIG, swig_force, swig_args, swig_deps) - # 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, @@ -387,27 +562,41 @@ if BUILD_OGL: # Define the STC extension module #---------------------------------------------------------------------- -if BUILD_STC: - print 'Preparing STC...' +if not GL_ONLY and BUILD_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, + swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], - [STC_H+'/stc.h']) + [opj(STC_H, 'stc.h')] + swig_deps) - # copy a project specific py module to the main package dir - copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1) + # 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 stc_includes = includes[:] @@ -419,6 +608,7 @@ if BUILD_STC: stc_defines = defines[:] stc_defines.append( ('__WX__', None) ) stc_defines.append( ('SCI_LEXER', None) ) + stc_defines.append( ('LINK_LEXERS', None) ) ext = Extension('stc_c', @@ -427,27 +617,40 @@ if 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/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/LexBaan.cxx' % STCLOC, + '%s/scintilla/src/LexBullant.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/LexLua.cxx' % STCLOC, + '%s/scintilla/src/LexMatlab.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, @@ -469,196 +672,265 @@ if BUILD_STC: #---------------------------------------------------------------------- -# Do the Setup/Build/Install/Whatever +# Define the IEWIN extension module (experimental) #---------------------------------------------------------------------- -setup(name = PKGDIR, - version = VERSION, - description = DESCRIPTION, - long_description = LONG_DESCRIPTION, - author = AUTHOR, - author_email = AUTHOR_EMAIL, - url = URL, - licence = LICENCE, +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, swig_deps) - packages = [PKGDIR, - PKGDIR+'.lib', - PKGDIR+'.lib.editor', - ], - ext_package = PKGDIR, - ext_modules = wxpExtensions, + 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, swig_deps) + + 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_gdctl.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/xmlres.cpp' % XMLLOC, + '%s/xmlrsall.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) #---------------------------------------------------------------------- +# 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, swig_deps) + + 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 #---------------------------------------------------------------------- -# The pre-distutils binary distributions of wxPython included the demo -# as a subdirectory of the package dir. This doesn't really make sense -# for Linux/Unix platforms as it's not part of the package, and the user -# may want to tweak and learn without having to become root first. -# -# For now I am going to start distributing the demo as a separate tarball, -# but if I ever want to go back to the old way, this is how to do it the -# distutils way: +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, swig_deps) -## from my_install_data import * + # copy a contrib project specific py module to the main package dir + copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0) -## Add this to the setup() call -## # Overridden command classes -## cmdclass = {'install_data': my_install_data}, -## # non python files of examples -## data_files = [ -## Data_Files( -## base_dir='install_lib', -## copy_to = 'wxPython', -## #strip_dirs = 2, -## template=[ 'graft demo', -## 'global-exclude CVS/*' -## ], -## preserve_path=1 -## ) -## ], + 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 #---------------------------------------------------------------------- -## if not BUILD_GLCANVAS: -## wxext.sources = wxext.sources + ['contrib/glcanvas/stub.cpp'] -## else: -## print 'Preparing GLCANVAS...' -## location = 'contrib/glcanvas' -## swig_files = ['glcanvas.i'] -## swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, -## USE_SWIG, swig_force, swig_args, swig_deps) +if __name__ == "__main__": + if not GL_ONLY: + setup(name = PKGDIR, + version = VERSION, + description = DESCRIPTION, + long_description = LONG_DESCRIPTION, + author = AUTHOR, + author_email = AUTHOR_EMAIL, + url = URL, + licence = LICENCE, + + packages = [PKGDIR, + PKGDIR+'.lib', + PKGDIR+'.lib.editor', + PKGDIR+'.lib.mixins', + PKGDIR+'.lib.PyCrust', + ], + + ext_package = PKGDIR, + ext_modules = wxpExtensions, + + options = { 'build' : { 'build_base' : BUILD_BASE }} + + ##data_files = TOOLS, + ) + + else: + + setup(name = "wxPython-gl", + version = VERSION, + description = "wxGLCanvas class for wxPython", + author = AUTHOR, + author_email = AUTHOR_EMAIL, + url = URL, + licence = LICENCE, -## 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'] + py_modules = [ "wxPython.glcanvas" ], -## wxext.sources = wxext.sources + swig_sources -## wxext.libraries = wxext.libraries + gl_libs - - -## if not BUILD_OGL: -## wxext.sources = wxext.sources + ['contrib/ogl/stub.cpp'] -## else: -## print 'Preparing OGL...' -## location = 'contrib/ogl' -## OGLLOC = location + '/contrib/src/ogl' -## OGLINC = location + '/contrib/include' - -## swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', -## 'oglcanvas.i'] - -## swig_sources = run_swig(swig_files, location, '', PKGDIR, -## USE_SWIG, swig_force, swig_args, swig_deps) - -## # 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) - -## # add items to the core extension module definition -## wxext.sources = wxext.sources + [location + '/oglhelpers.cpp', -## '%s/basic.cpp' % OGLLOC, -## '%s/bmpshape.cpp' % OGLLOC, -## '%s/composit.cpp' % OGLLOC, -## '%s/divided.cpp' % OGLLOC, -## '%s/lines.cpp' % OGLLOC, -## '%s/misc.cpp' % OGLLOC, -## '%s/basic2.cpp' % OGLLOC, -## '%s/canvas.cpp' % OGLLOC, -## '%s/constrnt.cpp' % OGLLOC, -## '%s/drawn.cpp' % OGLLOC, -## '%s/mfutils.cpp' % OGLLOC, -## '%s/ogldiag.cpp' % OGLLOC, -## ] + swig_sources - -## wxext.include_dirs = wxext.include_dirs + [OGLINC] - - - - -## if not BUILD_STC: -## wxext.sources = wxext.sources + ['contrib/stc/stub.cpp'] -## else: -## print 'Preparing STC...' -## location = 'contrib/stc' -## STCLOC = location + '/contrib/src/stc' -## STCINC = location + '/contrib/include' -## STC_H = 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) - - -## swig_files = ['stc_.i'] -## swig_sources = run_swig(swig_files, location, '', PKGDIR, -## USE_SWIG, swig_force, -## swig_args + ['-I'+STC_H, '-I'+location], -## swig_deps + [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) - -## # add some include dirs to the standard set -## stc_includes = [ '%s/scintilla/include' % STCLOC, -## '%s/scintilla/src' % STCLOC, -## STCINC ] - -## # and some macro definitions -## stc_defines = [ ('__WX__', None), -## ('SCI_LEXER', None) ] - - -## # add items to the core extension module definition -## wxext.sources = wxext.sources + [ -## '%s/scintilla/src/AutoComplete.cxx' % STCLOC, -## '%s/scintilla/src/CallTip.cxx' % STCLOC, -## '%s/scintilla/src/CellBuffer.cxx' % STCLOC, -## '%s/scintilla/src/ContractionState.cxx' % STCLOC, -## '%s/scintilla/src/Document.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/ScintillaBase.cxx' % STCLOC, -## '%s/scintilla/src/Style.cxx' % STCLOC, -## '%s/scintilla/src/ViewStyle.cxx' % STCLOC, -## '%s/scintilla/src/LexCPP.cxx' % STCLOC, -## '%s/scintilla/src/LexHTML.cxx' % STCLOC, -## '%s/scintilla/src/LexLua.cxx' % STCLOC, -## '%s/scintilla/src/LexOthers.cxx' % STCLOC, -## '%s/scintilla/src/LexPerl.cxx' % STCLOC, -## '%s/scintilla/src/LexPython.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, -## '%s/stc.cpp' % STCLOC, -## ] + swig_sources - -## wxext.include_dirs = wxext.include_dirs + stc_includes -## wxext.define_macros = wxext.define_macros + stc_defines + ext_package = PKGDIR, + ext_modules = wxpExtensions, + + ) + + + + +#---------------------------------------------------------------------- +#----------------------------------------------------------------------