X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/230e09add671b1920d934137c8f634d894ca7cdc..87f086bcbd6791f172e8b176d7155c614235638b:/wxPython/setup.py?ds=inline diff --git a/wxPython/setup.py b/wxPython/setup.py index 44ee2e1359..56b3d2c037 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 from distutils.core import setup, Extension from distutils.file_util import copy_file from distutils.dir_util import mkpath @@ -13,7 +13,12 @@ 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 = 0 +VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows +VER_FLAGS = "p1" # release flags, such as prerelease num, unicode, etc. + DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " @@ -41,9 +46,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 @@ -104,7 +106,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) #---------------------------------------------------------------------- @@ -201,7 +204,7 @@ def Verify_WX_CONFIG(): uf = 'u' else: uf = '' - ver2 = VERSION[:3] + ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR) WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2) searchpath = os.environ["PATH"] @@ -295,9 +298,70 @@ 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 @@ -338,17 +402,13 @@ if os.name == 'nt': GENDIR = 'msw' includes = ['src', - opj(WXDIR, 'lib', 'mswdll' + libFlag()), + opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll'), 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'), @@ -365,9 +425,14 @@ if os.name == 'nt': if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [ opj(WXDIR, 'lib') ] - wxdll = 'wxmsw' + WXDLLVER + libFlag() - libs = [ wxdll ] + libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + '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 +446,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,12 +459,8 @@ 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 +elif os.name == 'posix': WXDIR = '..' # assumes IN_CVS_TREE - WXPLAT = '__WXMAC__' - GENDIR = 'mac' - includes = ['src'] defines = [('SWIG_GLOBAL', None), ('HAVE_CONFIG_H', None), @@ -407,11 +468,12 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin": ] if UNDEF_NDEBUG: defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef - libdirs = [] - libs = ['stdc++'] Verify_WX_CONFIG() + libdirs = [] + libs = [] + cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] cflags = cflags.split() if debug: @@ -421,59 +483,51 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin": 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] -#---------------------------------------------------------------------- + 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 -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 - - 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 +536,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... + +wxVERSION_STRING = '%(VERSION)s' +wxMAJOR_VERSION = %(VER_MAJOR)s +wxMINOR_VERSION = %(VER_MINOR)s +wxRELEASE_VERSION = %(VER_RELEASE)s +wxSUBREL_VERSION = %(VER_SUBREL)s + +wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION, + wxSUBREL_VERSION, '%(VER_FLAGS)s') + +wxRELEASE_NUMBER = wxRELEASE_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) @@ -645,14 +715,10 @@ 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, USE_SWIG, swig_force, swig_args, swig_deps) @@ -663,12 +729,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, + swig_sources, include_dirs = includes, define_macros = defines, @@ -690,8 +755,6 @@ 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'] @@ -699,30 +762,14 @@ if BUILD_OGL: 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, '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('oglc', + swig_sources, - include_dirs = [OGLINC] + includes, - define_macros = defines, + include_dirs = includes, + define_macros = defines + [('wxUSE_DEPRECATED', '0')], library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('ogl'), extra_compile_args = cflags, extra_link_args = lflags, @@ -739,29 +786,25 @@ 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 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'] @@ -773,70 +816,14 @@ if BUILD_STC: # 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, + 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, @@ -884,80 +871,19 @@ 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, + ext = Extension('xrcc', + 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 +900,19 @@ 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, 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, + ext = Extension('gizmosc', + [ '%s/treelistctrl.cpp' % location ] + swig_sources, - include_dirs = gizmos_includes, + include_dirs = includes, define_macros = defines, library_dirs = libdirs, - libraries = libs, + libraries = libs + makeLibName('gizmos'), extra_compile_args = cflags, extra_link_args = lflags, @@ -1045,117 +954,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 +970,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('wxPython/tools/XRCed', '*.txt', '*.xrc') +DATA_FILES += find_data_files('wxPython/py', '*.txt', '*.ico', '*.css', '*.html') +DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html') #---------------------------------------------------------------------- @@ -1198,15 +997,25 @@ if __name__ == "__main__": url = 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', + packages = ['wxPython', + 'wxPython.lib', + 'wxPython.lib.colourchooser', + 'wxPython.lib.editor', + 'wxPython.lib.mixins', + 'wxPython.lib.PyCrust', + 'wxPython.py', + 'wxPython.py.wxd', + 'wxPython.tools', + 'wxPython.tools.XRCed', + + 'wx', + 'wx.lib', + 'wx.lib.colourchooser', + 'wx.lib.editor', + 'wx.lib.mixins', + 'wx.py', + 'wx.tools', + 'wx.tools.XRCed', ], ext_package = PKGDIR,