X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/230e09add671b1920d934137c8f634d894ca7cdc..05e4fd64c4c7141f1a028020584755bad7291d02:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index 44ee2e1359..a2ac921ccf 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python #---------------------------------------------------------------------- -import sys, os, glob +import sys, os, glob, fnmatch, tempfile from distutils.core import setup, Extension from distutils.file_util import copy_file from distutils.dir_util import mkpath @@ -13,12 +13,21 @@ from distutils.command.install_data import install_data # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.5.0p1" +VER_MAJOR = 2 # The first three must match wxWindows +VER_MINOR = 5 +VER_RELEASE = 1 +VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows +VER_FLAGS = "p8" # release flags, such as prerelease num, unicode, etc. + DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" -LICENSE = "wxWindows (LGPL derivative)" +DOWNLOAD_URL = "http://wxPython.org/download.php" +LICENSE = "wxWindows Library License (LGPL derivative)" +PLATFORMS = "WIN32,OSX,POSIX" +KEYWORDS = "GUI,wx,wxWindows,cross-platform" + 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 @@ -27,6 +36,22 @@ feel (by using the native widgets) on the platforms it is supported on. """ +CLASSIFIERS = """\ +Development Status :: 6 - Mature +Environment :: MacOS X :: Carbon +Environment :: Win32 (MS Windows) +Environment :: X11 Applications :: GTK +Intended Audience :: Developers +License :: OSI Approved +Operating System :: MacOS :: MacOS X +Operating System :: Microsoft :: Windows :: Windows 95/98/2000 +Operating System :: POSIX +Programming Language :: Python +Topic :: Software Development :: User Interfaces +""" + +## License :: OSI Approved :: wxWindows Library Licence + # Config values below this point can be reset on the setup.py command line. @@ -41,9 +66,6 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets # Internet Explorer wrapper (experimental) BUILD_IEWIN = (os.name == 'nt') -BUILD_CANVAS = 0 # Build a canvas module using the one in wx/contrib (experimental) -BUILD_ART2D = 0 # Build a canvas module using code from the wxArt2D project (experimental) - CORE_ONLY = 0 # if true, don't build any of the above @@ -52,18 +74,14 @@ PREP_ONLY = 0 # Only run the prepatory steps, not the actual build. USE_SWIG = 0 # Should we actually execute SWIG, or just use the # files already in the distribution? +SWIG = "swig" # The swig executable to use. + +BUILD_RENAMERS = 1 # Should we build the renamer modules too? + 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 = 1 # Set to true if building in a full wxWindows CVS - # tree, or the new style of a full wxPythonSrc tarball. - # wxPython used to be distributed as a separate source - # tarball without the wxWindows but with a copy of the - # needed contrib code. That's no longer the case and so - # this setting is now defaulting to true. Eventually it - # should be removed entirly. - 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 @@ -104,7 +122,8 @@ HYBRID = 1 # 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 = '250' # Version part of wxWindows DLL name + # Version part of wxWindows LIB/DLL names +WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR) #---------------------------------------------------------------------- @@ -135,12 +154,14 @@ def libFlag(): # Some other globals #---------------------------------------------------------------------- -PKGDIR = 'wxPython' +PKGDIR = 'wx' wxpExtensions = [] DATA_FILES = [] force = '--force' in sys.argv or '-f' in sys.argv debug = '--debug' in sys.argv or '-g' in sys.argv +cleaning = 'clean' in sys.argv + # change the PORT default for wxMac if sys.platform[:6] == "darwin": @@ -158,8 +179,8 @@ if os.name == 'nt': # Boolean (int) flags for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', - 'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', - 'UNDEF_NDEBUG', 'NO_SCRIPTS', + 'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE', + 'UNDEF_NDEBUG', 'NO_SCRIPTS', 'BUILD_RENAMERS', 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): if sys.argv[x].find(flag) == 0: @@ -169,7 +190,7 @@ for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', sys.argv[x] = '' # String options -for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT']: +for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT', 'SWIG']: for x in range(len(sys.argv)): if sys.argv[x].find(option) == 0: pos = sys.argv[x].find('=') + 1 @@ -201,8 +222,11 @@ def Verify_WX_CONFIG(): uf = 'u' else: uf = '' - ver2 = VERSION[:3] - WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2) + ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR) + port = WXPORT + if port == "x11": + port = "x11univ" + WX_CONFIG = 'wx%s%s%s-%s-config' % (port, uf, df, ver2) searchpath = os.environ["PATH"] for p in searchpath.split(':'): @@ -221,34 +245,62 @@ def Verify_WX_CONFIG(): def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, swig_deps=[]): """Run SWIG the way I want it done""" + if not os.path.exists(os.path.join(dir, gendir)): os.mkdir(os.path.join(dir, gendir)) + if not os.path.exists(os.path.join("docs", "xml-raw")): + os.mkdir(os.path.join("docs", "xml-raw")) + sources = [] for file in files: basefile = os.path.splitext(file)[0] i_file = os.path.join(dir, file) py_file = os.path.join(dir, gendir, basefile+'.py') - cpp_file = os.path.join(dir, gendir, basefile+'.cpp') + cpp_file = os.path.join(dir, gendir, basefile+'_wrap.cpp') + xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml') sources.append(cpp_file) - if USE_SWIG: + if not cleaning and USE_SWIG: for dep in swig_deps: if newer(dep, py_file) or newer(dep, cpp_file): force = 1 break if force or newer(i_file, py_file) or newer(i_file, cpp_file): - # we need forward slashes here even on win32 - cpp_file = '/'.join(cpp_file.split('\\')) - i_file = '/'.join(i_file.split('\\')) - - cmd = ['./wxSWIG/wxswig'] + swig_args + ['-I'+dir, '-c', '-o', cpp_file, i_file] + ## we need forward slashes here even on win32 + #cpp_file = opj(cpp_file) #'/'.join(cpp_file.split('\\')) + #i_file = opj(i_file) #'/'.join(i_file.split('\\')) + + if BUILD_RENAMERS: + #tempfile.tempdir = sourcePath + xmltemp = tempfile.mktemp('.xml') + + # First run swig to produce the XML file, adding + # an extra -D that prevents the old rename + # directives from being used + cmd = [ swig_cmd ] + swig_args + \ + [ '-DBUILDING_RENAMERS', '-xmlout', xmltemp ] + \ + ['-I'+dir, '-o', cpp_file, i_file] + msg(' '.join(cmd)) + spawn(cmd) + + # Next run build_renamers to process the XML + cmd = [ sys.executable, '-u', + './distrib/build_renamers.py', dir, basefile, xmltemp] + msg(' '.join(cmd)) + spawn(cmd) + os.remove(xmltemp) + + # Then run swig for real + cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file, + '-xmlout', xml_file, i_file] msg(' '.join(cmd)) spawn(cmd) + # copy the generated python file to the package directory copy_file(py_file, package, update=not force, verbose=0) @@ -295,8 +347,69 @@ def build_locale_list(srcdir): return file_list +def find_data_files(srcdir, *wildcards): + # get a list of all files under the srcdir matching wildcards, + # returned in a format to be used for install_data + + def walk_helper(arg, dirname, files): + names = [] + lst, wildcards = arg + for wc in wildcards: + for f in files: + filename = opj(dirname, f) + if fnmatch.fnmatch(filename, wc) and not os.path.isdir(filename): + names.append(filename) + if names: + lst.append( (dirname, names ) ) + + file_list = [] + os.path.walk(srcdir, walk_helper, (file_list, wildcards)) + return file_list + + +def makeLibName(name): + if os.name == 'posix': + libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE) + else: + libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name) + + return [libname] + + + +def adjustCFLAGS(cflags, defines, includes): + '''Extrace the raw -I, -D, and -U flags and put them into + defines and includes as needed.''' + newCFLAGS = [] + for flag in cflags: + if flag[:2] == '-I': + includes.append(flag[2:]) + elif flag[:2] == '-D': + flag = flag[2:] + if flag.find('=') == -1: + defines.append( (flag, None) ) + else: + defines.append( tuple(flag.split('=')) ) + elif flag[:2] == '-U': + defines.append( (flag[2:], ) ) + else: + newCFLAGS.append(flag) + return newCFLAGS + +def adjustLFLAGS(lfags, libdirs, libs): + '''Extrace the -L and -l flags and put them in libdirs and libs as needed''' + newLFLAGS = [] + for flag in lflags: + if flag[:2] == '-L': + libdirs.append(flag[2:]) + elif flag[:2] == '-l': + libs.append(flag[2:]) + else: + newLFLAGS.append(flag) + + return newLFLAGS #---------------------------------------------------------------------- # sanity checks @@ -337,37 +450,39 @@ if os.name == 'nt': WXPLAT = '__WXMSW__' GENDIR = 'msw' - includes = ['src', - opj(WXDIR, 'lib', 'mswdll' + libFlag()), + includes = ['include', 'src', + opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()), opj(WXDIR, 'include'), + opj(WXDIR, 'contrib', 'include'), ] defines = [ ('WIN32', None), - ('__WIN32__', None), ('_WINDOWS', None), - ('__WINDOWS__', None), - ('WINVER', '0x0400'), - ('__WIN95__', None), - ('STRICT', None), (WXPLAT, None), ('WXUSINGDLL', '1'), ('SWIG_GLOBAL', None), - ('HAVE_CONFIG_H', None), ('WXP_USE_THREAD', '1'), ] if UNDEF_NDEBUG: defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef + if HYBRID: + defines.append( ('__NO_VC_CRTDBG__', None) ) if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [ opj(WXDIR, 'lib') ] - wxdll = 'wxmsw' + WXDLLVER + libFlag() - libs = [ wxdll ] + libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ] + libs = [ 'wxbase' + WXDLLVER + libFlag(), # TODO: trim this down to what is really needed for the core + 'wxbase' + WXDLLVER + libFlag() + '_net', + 'wxbase' + WXDLLVER + libFlag() + '_xml', + makeLibName('core')[0], + makeLibName('adv')[0], + makeLibName('html')[0], + ] libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32', 'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32', @@ -381,7 +496,7 @@ if os.name == 'nt': lflags = None # Other MSVC flags... - # To bad I don't remember why I was playing with these, can they be removed? + # Too bad I don't remember why I was playing with these, can they be removed? if FINAL: pass #cflags = cflags + ['/O1'] elif HYBRID : @@ -394,86 +509,84 @@ 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'] +elif os.name == 'posix': + WXDIR = '..' + includes = ['include', 'src'] defines = [('SWIG_GLOBAL', None), ('HAVE_CONFIG_H', None), ('WXP_USE_THREAD', '1'), ] if UNDEF_NDEBUG: defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef - libdirs = [] - libs = ['stdc++'] Verify_WX_CONFIG() + libdirs = [] + libs = [] + + # If you get unresolved symbol errors on Solaris and are using gcc, then + # uncomment this block to add the right flags to the link step and build + # again. + ## if os.uname()[0] == 'SunOS': + ## libs.append('gcc') + ## libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1]) + cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] cflags = cflags.split() if debug: cflags.append('-g') cflags.append('-O0') + else: + cflags.append('-O3') lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] lflags = lflags.split() - NO_SCRIPTS = 1 - - -#---------------------------------------------------------------------- + WXBASENAME = os.popen(WX_CONFIG + ' --basename').read()[:-1] + WXRELEASE = os.popen(WX_CONFIG + ' --release').read()[:-1] + WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1] -elif os.name == 'posix': - # Set flags for other Unix type platforms - WXDIR = '..' # assumes IN_CVS_TREE - GENDIR = WXPORT - - if WXPORT == 'gtk': - WXPLAT = '__WXGTK__' - portcfg = os.popen('gtk-config --cflags', 'r').read()[:-1] - elif WXPORT == 'gtk2': - WXPLAT = '__WXGTK__' - GENDIR = 'gtk' # no code differences so use the same generated sources - portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1] - BUILD_BASE = BUILD_BASE + '-' + WXPORT - elif WXPORT == 'x11': - WXPLAT = '__WXX11__' - portcfg = '' - BUILD_BASE = BUILD_BASE + '-' + WXPORT - else: - raise SystemExit, "Unknown WXPORT value: " + WXPORT - includes = ['src'] - defines = [('SWIG_GLOBAL', None), - ('HAVE_CONFIG_H', None), - ('WXP_USE_THREAD', '1'), - ] - if UNDEF_NDEBUG: - defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef + if sys.platform[:6] == "darwin": + # Flags and such for a Darwin (Max OS X) build of Python + WXPLAT = '__WXMAC__' + GENDIR = 'mac' + libs = ['stdc++'] + NO_SCRIPTS = 1 - libdirs = [] - libs = [] - Verify_WX_CONFIG() + else: + # Set flags for other Unix type platforms + GENDIR = WXPORT + + if WXPORT == 'gtk': + WXPLAT = '__WXGTK__' + portcfg = os.popen('gtk-config --cflags', 'r').read()[:-1] + elif WXPORT == 'gtk2': + WXPLAT = '__WXGTK__' + GENDIR = 'gtk' # no code differences so use the same generated sources + portcfg = os.popen('pkg-config gtk+-2.0 --cflags', 'r').read()[:-1] + BUILD_BASE = BUILD_BASE + '-' + WXPORT + elif WXPORT == 'x11': + WXPLAT = '__WXX11__' + portcfg = '' + BUILD_BASE = BUILD_BASE + '-' + WXPORT + else: + raise SystemExit, "Unknown WXPORT value: " + WXPORT - cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + portcfg + cflags += portcfg.split() - cflags = cflags.split() - if debug: - cflags.append('-g') - cflags.append('-O0') + # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but + # wx-config doesn't output that for some reason. For now, just + # add it unconditionally but we should really check if the lib is + # really found there or wx-config should be fixed. + libdirs.append("/usr/X11R6/lib") - lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] - lflags = lflags.split() - # Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but - # wx-config doesn't output that for some reason. For now, just - # add it unconditionally but we should really check if the lib is - # really found there or wx-config should be fixed. - libdirs.append("/usr/X11R6/lib") + # Move the various -I, -D, etc. flags we got from the *config scripts + # into the distutils lists. + cflags = adjustCFLAGS(cflags, defines, includes) + lflags = adjustLFLAGS(lflags, libdirs, libs) #---------------------------------------------------------------------- @@ -482,22 +595,38 @@ else: #---------------------------------------------------------------------- -# post platform setup checks and tweaks +# post platform setup checks and tweaks, create the full version string #---------------------------------------------------------------------- if UNICODE: BUILD_BASE = BUILD_BASE + '.unicode' - VERSION = VERSION + 'u' + VER_FLAGS += 'u' + +VERSION = "%s.%s.%s.%s%s" % (VER_MAJOR, VER_MINOR, VER_RELEASE, + VER_SUBREL, VER_FLAGS) #---------------------------------------------------------------------- -# Check if the version file needs updated +# Update the version file #---------------------------------------------------------------------- -##if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'): +# Unconditionally updated since the version string can change based +# on the UNICODE flag +open('src/__version__.py', 'w').write("""\ +# This file was generated by setup.py... + +VERSION_STRING = '%(VERSION)s' +MAJOR_VERSION = %(VER_MAJOR)s +MINOR_VERSION = %(VER_MINOR)s +RELEASE_VERSION = %(VER_RELEASE)s +SUBREL_VERSION = %(VER_SUBREL)s + +VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION, + SUBREL_VERSION, '%(VER_FLAGS)s') + +RELEASE_NUMBER = RELEASE_VERSION # for compatibility +""" % globals()) -# Always do it since the version string can change based on the UNICODE flag -open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) @@ -505,17 +634,35 @@ open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) # SWIG defaults #---------------------------------------------------------------------- +swig_cmd = SWIG swig_force = force -swig_args = ['-c++', '-shadow', '-python', '-keyword', - '-dnone', - #'-dascii', - #'-docstring', '-Sbefore', - '-I./src', '-D'+WXPLAT, +swig_args = ['-c++', + '-Wall', + '-nodefault', + +## '-xml', + + '-python', + '-keyword', + '-new_repr', + '-modern', + + '-I./src', + '-D'+WXPLAT, + '-noruntime' ] if UNICODE: swig_args.append('-DwxUSE_UNICODE') -swig_deps = ['src/my_typemaps.i'] +swig_deps = [ 'src/my_typemaps.i', + 'src/common.swg', + 'src/pyrun.swg', + ] + +depends = [ #'include/wx/wxPython/wxPython.h', + #'include/wx/wxPython/wxPython_int.h', + #'src/pyclasses.h', + ] #---------------------------------------------------------------------- @@ -523,24 +670,40 @@ swig_deps = ['src/my_typemaps.i'] #---------------------------------------------------------------------- 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' - ] - -swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) +swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ 'src/_accel.i', + 'src/_app.i', + 'src/_app_ex.py', + 'src/_constraints.i', + 'src/_core_api.i', + 'src/_core_ex.py', + 'src/_core_rename.i', + 'src/_core_reverse.txt', + 'src/_defs.i', + 'src/_event.i', + 'src/_event_ex.py', + 'src/_evthandler.i', + 'src/_filesys.i', + 'src/_gdicmn.i', + 'src/_image.i', + 'src/_menu.i', + 'src/_obj.i', + 'src/_sizers.i', + 'src/_gbsizer.i', + 'src/_streams.i', + 'src/_validator.i', + 'src/_window.i', + ]) copy_file('src/__init__.py', PKGDIR, update=1, verbose=0) copy_file('src/__version__.py', PKGDIR, update=1, verbose=0) -if IN_CVS_TREE: # update the license 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) +# update the license 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': @@ -554,9 +717,8 @@ else: rc_file = [] -ext = Extension('wxc', ['src/helpers.cpp', - 'src/drawlist.cpp', - 'src/libpy.c', +ext = Extension('_core', ['src/helpers.cpp', + 'src/libpy.c', ] + rc_file + swig_sources, include_dirs = includes, @@ -567,94 +729,202 @@ ext = Extension('wxc', ['src/helpers.cpp', extra_compile_args = cflags, extra_link_args = lflags, + + depends = depends ) 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, + + + +# Extension for the GDI module +swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + ['src/_gdi_rename.i', + 'src/_bitmap.i', 'src/_brush.i', + 'src/_colour.i', 'src/_cursor.i', + 'src/_dc.i', 'src/_font.i', + 'src/_gdiobj.i', 'src/_icon.i', + 'src/_imaglist.i', 'src/_pen.i', + 'src/_region.i', 'src/_palette.i', + 'src/_stockobjs.i', + 'src/_effects.i', + 'src/_intl.i', + 'src/_intl_ex.py', + ]) +ext = Extension('_gdi', ['src/drawlist.cpp'] + swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, + depends = depends ) 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, + + + + +# Extension for the windows module +swig_sources = run_swig(['windows.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + ['src/_windows_rename.i', 'src/_windows_reverse.txt', + 'src/_panel.i', + 'src/_toplvl.i', 'src/_statusbar.i', + 'src/_splitter.i', 'src/_sashwin.i', + 'src/_popupwin.i', 'src/_tipwin.i', + 'src/_vscroll.i', 'src/_taskbar.i', + 'src/_cmndlgs.i', 'src/_mdi.i', + 'src/_pywindows.i', 'src/_printfw.i', + ]) +ext = Extension('_windows', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + depends = depends + ) +wxpExtensions.append(ext) + + + + +# Extension for the controls module +swig_sources = run_swig(['controls.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ 'src/_controls_rename.i', 'src/_controls_reverse.txt', + 'src/_control.i', 'src/_toolbar.i', + 'src/_button.i', 'src/_checkbox.i', + 'src/_choice.i', 'src/_combobox.i', + 'src/_gauge.i', 'src/_statctrls.i', + 'src/_listbox.i', 'src/_textctrl.i', + 'src/_scrolbar.i', 'src/_spin.i', + 'src/_radio.i', 'src/_slider.i', + 'src/_tglbtn.i', 'src/_notebook.i', + 'src/_listctrl.i', 'src/_treectrl.i', + 'src/_dirctrl.i', 'src/_pycontrol.i', + 'src/_cshelp.i', 'src/_dragimg.i', + ]) +ext = Extension('_controls', swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, + depends = depends ) wxpExtensions.append(ext) -# Extension for the calendar module + + +# Extension for the misc module +swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ 'src/_settings.i', 'src/_functions.i', + 'src/_misc.i', 'src/_tipdlg.i', + 'src/_timer.i', 'src/_log.i', + 'src/_process.i', 'src/_joystick.i', + 'src/_sound.i', 'src/_mimetype.i', + 'src/_artprov.i', 'src/_config.i', + 'src/_datetime.i', 'src/_dataobj.i', + 'src/_dnd.i', + 'src/_clipbrd.i', + ]) +ext = Extension('_misc', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + depends = depends + ) +wxpExtensions.append(ext) + + + +## +## Core modules that are not in the "core" namespace start here +## + swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) -ext = Extension('calendarc', swig_sources, +ext = Extension('_calendar', swig_sources, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + depends = depends + ) +wxpExtensions.append(ext) + + +swig_sources = run_swig(['grid.i'], 'src', GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps) +ext = Extension('_grid', swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, + depends = depends ) wxpExtensions.append(ext) -# Extension for the help module -swig_sources = run_swig(['help.i'], 'src', GENDIR, PKGDIR, + +swig_sources = run_swig(['html.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) -ext = Extension('helpc', swig_sources, +ext = Extension('_html', swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, + depends = depends ) wxpExtensions.append(ext) -# Extension for the wizard module + swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) -ext = Extension('wizardc', swig_sources, +ext = Extension('_wizard', swig_sources, include_dirs = includes, define_macros = defines, library_dirs = libdirs, libraries = libs, extra_compile_args = cflags, extra_link_args = lflags, + depends = depends ) wxpExtensions.append(ext) + + + #---------------------------------------------------------------------- # Define the GLCanvas extension module #---------------------------------------------------------------------- -CTRB_SRC = opj(WXDIR, 'contrib/src') -CTRB_INC = opj(WXDIR, 'contrib/include/wx') - if BUILD_GLCANVAS: msg('Preparing GLCANVAS...') location = 'contrib/glcanvas' - swig_files = ['glcanvas.i'] - other_sources = [] - swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, + swig_sources = run_swig(['glcanvas.i'], location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args, swig_deps) gl_libs = [] @@ -663,12 +933,11 @@ if BUILD_GLCANVAS: gl_lflags = gl_config.split() + lflags gl_libs = libs else: - other_sources = [opj(location, 'msw/myglcanvas.cpp')] - gl_libs = libs + ['opengl32', 'glu32'] + gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl') gl_lflags = lflags - ext = Extension('glcanvasc', - swig_sources + other_sources, + ext = Extension('_glcanvas', + swig_sources, include_dirs = includes, define_macros = defines, @@ -690,39 +959,24 @@ if BUILD_GLCANVAS: if BUILD_OGL: msg('Preparing OGL...') location = 'contrib/ogl' - 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, swig_deps) + swig_sources = run_swig(['ogl.i'], location, GENDIR, PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ '%s/_oglbasic.i' % location, + '%s/_oglshapes.i' % location, + '%s/_oglshapes2.i' % location, + '%s/_oglcanvas.i' % location, + '%s/_ogldefs.i' % location, + ]) - if IN_CVS_TREE: - # 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, - '%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, + ext = Extension('_ogl', + swig_sources, - include_dirs = [OGLINC] + includes, - define_macros = defines, + include_dirs = includes + [ location ], + define_macros = defines + [('wxUSE_DEPRECATED', '0')], library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('ogl'), extra_compile_args = cflags, extra_link_args = lflags, @@ -739,104 +993,40 @@ if BUILD_OGL: if BUILD_STC: msg('Preparing STC...') location = 'contrib/stc' - STCLOC = opj(location, 'contrib/src/stc') - STCINC = opj(location, 'contrib/include') - STC_H = opj(location, 'contrib/include/wx/stc') - - if IN_CVS_TREE: - # 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')) - sys.path.insert(0, os.curdir) - import gen_iface - gen_iface.main([]) - os.chdir(cwd) + if os.name == 'nt': + STC_H = opj(WXDIR, 'contrib', 'include/wx/stc') + else: + STC_H = opj(WXPREFIX, 'include/wx/stc') +## NOTE: need to add something like this to the stc.bkl... - # 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) +## # 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')) +## sys.path.insert(0, os.curdir) +## import gen_iface +## gen_iface.main([]) +## os.chdir(cwd) - swig_files = ['stc_.i'] - swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, + swig_sources = run_swig(['stc.i'], location, '', PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], [opj(STC_H, 'stc.h')] + swig_deps) - # 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[:] - stc_includes.append('%s/scintilla/include' % STCLOC) - stc_includes.append('%s/scintilla/src' % STCLOC) - stc_includes.append(STCINC) - - # and some macro definitions - stc_defines = defines[:] - stc_defines.append( ('__WX__', None) ) - stc_defines.append( ('SCI_LEXER', None) ) - stc_defines.append( ('LINK_LEXERS', None) ) - - - ext = Extension('stc_c', - ['%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/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/PlatWX.cpp' % STCLOC, - '%s/ScintillaWX.cpp' % STCLOC, - '%s/stc.cpp' % STCLOC, - ] + swig_sources, - - include_dirs = stc_includes, - define_macros = stc_defines, + ext = Extension('_stc', + swig_sources, + + include_dirs = includes, + define_macros = defines, library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('stc'), extra_compile_args = cflags, extra_link_args = lflags, @@ -860,7 +1050,7 @@ if BUILD_IEWIN: USE_SWIG, swig_force, swig_args, swig_deps) - ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location, + ext = Extension('_iewin', ['%s/IEHtmlWin.cpp' % location, '%s/wxactivex.cpp' % location, ] + swig_sources, @@ -884,80 +1074,25 @@ if BUILD_IEWIN: if 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_scwin.cpp' % XMLLOC, - - '%s/xh_sizer.cpp' % XMLLOC, - '%s/xh_slidr.cpp' % XMLLOC, - '%s/xh_spin.cpp' % XMLLOC, - '%s/xh_split.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 = run_swig(['xrc.i'], location, '', PKGDIR, + USE_SWIG, swig_force, swig_args, swig_deps + + [ '%s/_xrc_rename.i' % location, + '%s/_xrc_ex.py' % location, + '%s/_xmlres.i' % location, + '%s/_xmlsub.i' % location, + '%s/_xml.i' % location, + '%s/_xmlhandler.i' % location, + ]) - ] + swig_sources, + ext = Extension('_xrc', + swig_sources, - include_dirs = xmlres_includes, + include_dirs = includes, define_macros = defines, library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('xrc'), extra_compile_args = cflags, extra_link_args = lflags, @@ -974,36 +1109,18 @@ if BUILD_XRC: if 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, + swig_sources = run_swig(['gizmos.i'], location, GENDIR, 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('_gizmos', + [ '%s/treelistctrl.cpp' % location ] + swig_sources, - 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, + include_dirs = includes + [ location ], define_macros = defines, library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('gizmos'), extra_compile_args = cflags, extra_link_args = lflags, @@ -1045,117 +1162,6 @@ if BUILD_DLLWIDGET: wxpExtensions.append(ext) -#---------------------------------------------------------------------- -# Define the CANVAS extension module -#---------------------------------------------------------------------- - -if BUILD_CANVAS: - msg('Preparing CANVAS...') - location = 'contrib/canvas' - CANVASLOC = opj(location, 'contrib/src/canvas') - CANVASINC = opj(location, 'contrib/include') - - swig_files = ['canvas.i'] - - swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) - - if IN_CVS_TREE: - # make sure local copy of contrib files are up to date - contrib_copy_tree(opj(CTRB_INC, 'canvas'), opj(CANVASINC, 'wx/canvas')) - contrib_copy_tree(opj(CTRB_SRC, 'canvas'), CANVASLOC) - - ext = Extension('canvasc', ['%s/bbox.cpp' % CANVASLOC, - '%s/liner.cpp' % CANVASLOC, - '%s/polygon.cpp' % CANVASLOC, - '%s/canvas.cpp' % CANVASLOC, - ] + swig_sources, - - include_dirs = [CANVASINC] + includes, - define_macros = defines, - - library_dirs = libdirs, - libraries = libs, - - extra_compile_args = cflags, - extra_link_args = lflags, - ) - - wxpExtensions.append(ext) - - -#---------------------------------------------------------------------- -# Define the ART2D extension module -#---------------------------------------------------------------------- - -if BUILD_ART2D: - msg('Preparing ART2D...') - location = 'contrib/art2d' - ART2DLOC = opj(location, 'modules/canvas/src') - ART2DINC = opj(location, 'modules/canvas/include') - EXPATLOC = opj(location, 'modules/expat') - EXPATINC = opj(location, 'modules/expat/include') - - swig_files = ['art2d.i', - 'art2d_misc.i', - 'art2d_base.i', - 'art2d_canvas.i', - ] - - swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args, swig_deps) - - if IN_CVS_TREE: - # Don't copy data in this case as the code snapshots are - # taken manually - pass - - ext = Extension('art2dc', [ opj(ART2DLOC, 'afmatrix.cpp'), - opj(ART2DLOC, 'bbox.cpp'), - opj(ART2DLOC, 'cancom.cpp'), - opj(ART2DLOC, 'candoc.cpp'), - opj(ART2DLOC, 'canglob.cpp'), - opj(ART2DLOC, 'canobj3d.cpp'), - opj(ART2DLOC, 'canobj.cpp'), - opj(ART2DLOC, 'canprim.cpp'), - opj(ART2DLOC, 'canprop.cpp'), - opj(ART2DLOC, 'canvas.cpp'), - opj(ART2DLOC, 'docviewref.cpp'), - opj(ART2DLOC, 'drawer.cpp'), - opj(ART2DLOC, 'eval.cpp'), - opj(ART2DLOC, 'graph.cpp'), - opj(ART2DLOC, 'layerinf.cpp'), - opj(ART2DLOC, 'liner.cpp'), - opj(ART2DLOC, 'meta.cpp'), - opj(ART2DLOC, 'objlist.cpp'), - opj(ART2DLOC, 'polygon.cpp'), - opj(ART2DLOC, 'recur.cpp'), - opj(ART2DLOC, 'rendimg.cpp'), - opj(ART2DLOC, 'tools.cpp'), - opj(ART2DLOC, 'vpath.cpp'), - opj(ART2DLOC, 'xmlpars.cpp'), - - opj(EXPATLOC, 'xmlparse/xmlparse.c'), - opj(EXPATLOC, 'xmltok/xmlrole.c'), - opj(EXPATLOC, 'xmltok/xmltok.c'), - - ] + swig_sources, - - include_dirs = [ ART2DINC, - EXPATINC, - opj(EXPATLOC, 'xmltok'), - opj(EXPATLOC, 'xmlparse'), - ] + includes, - define_macros = defines, - - library_dirs = libdirs, - libraries = libs, - - extra_compile_args = cflags, - extra_link_args = lflags, - ) - - wxpExtensions.append(ext) #---------------------------------------------------------------------- @@ -1172,15 +1178,16 @@ else: opj('scripts/xrced'), opj('scripts/pyshell'), opj('scripts/pycrust'), - opj('scripts/pycwrap'), + opj('scripts/pywrap'), + opj('scripts/pywrap'), + opj('scripts/pyalacarte'), + opj('scripts/pyalamode'), ] -DATA_FILES.append( ('wxPython/tools/XRCed', glob.glob('wxPython/tools/XRCed/*.txt') + - [ 'wxPython/tools/XRCed/xrced.xrc'])) - -DATA_FILES.append( ('wxPython/lib/PyCrust', glob.glob('wxPython/lib/PyCrust/*.txt') + - glob.glob('wxPython/lib/PyCrust/*.ico'))) +DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc') +DATA_FILES += find_data_files('wx/py', '*.txt', '*.ico', '*.css', '*.html') +DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html') #---------------------------------------------------------------------- @@ -1189,24 +1196,34 @@ DATA_FILES.append( ('wxPython/lib/PyCrust', glob.glob('wxPython/lib/PyCrust/*.tx if __name__ == "__main__": if not PREP_ONLY: - setup(name = PKGDIR, + setup(name = 'wxPython', version = VERSION, description = DESCRIPTION, long_description = LONG_DESCRIPTION, author = AUTHOR, author_email = AUTHOR_EMAIL, url = URL, + download_url = DOWNLOAD_URL, license = LICENSE, - - packages = [PKGDIR, - PKGDIR+'.lib', - PKGDIR+'.lib.colourchooser', - PKGDIR+'.lib.editor', - PKGDIR+'.lib.mixins', - PKGDIR+'.lib.PyCrust', - PKGDIR+'.lib.PyCrust.wxd', - PKGDIR+'.tools', - PKGDIR+'.tools.XRCed', + platforms = PLATFORMS, + classifiers = filter(None, CLASSIFIERS.split("\n")), + keywords = KEYWORDS, + + packages = ['wxPython', + 'wxPython.lib', + 'wxPython.lib.colourchooser', + 'wxPython.lib.editor', + 'wxPython.lib.mixins', + 'wxPython.tools', + + 'wx', + 'wx.lib', + 'wx.lib.colourchooser', + 'wx.lib.editor', + 'wx.lib.mixins', + 'wx.py', + 'wx.tools', + 'wx.tools.XRCed', ], ext_package = PKGDIR,