X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ce914f7319a5946f49da4c06e95be94dcd49611e..7728856b75c201016a30145673bc8a85be96fdfe:/wxPython/setup.py?ds=inline diff --git a/wxPython/setup.py b/wxPython/setup.py index 47ca253c00..44ee2e1359 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -1,74 +1,110 @@ #!/usr/bin/env python #---------------------------------------------------------------------- -import sys, os, string, glob +import sys, os, glob from distutils.core import setup, Extension from distutils.file_util import copy_file from distutils.dir_util import mkpath from distutils.dep_util import newer - -from my_distutils import run_swig, contrib_copy_tree +from distutils.spawn import spawn +from distutils.command.install_data import install_data #---------------------------------------------------------------------- # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.3rc" +VERSION = "2.5.0p1" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " URL = "http://wxPython.org/" -LICENCE = "wxWindows (LGPL derivative)" +LICENSE = "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 implemented with a native look and -feel (and native runtime speed) on the platforms it is supported +feel (by using the native widgets) on the platforms it is supported on. """ +# Config values below this point can be reset on the setup.py command line. + 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 for the gizmos contrib library +BUILD_DLLWIDGET = 0# 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) + # 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 +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 +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? -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 +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 + # 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. + +NO_SCRIPTS = 0 # Don't install the tool scripts + +WX_CONFIG = None # 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. By + # default a wx-config command will be assembled based on + # version, port, etc. and it will be looked for on the + # default $PATH. + +WXPORT = 'gtk' # On Linux/Unix there are several ports of wxWindows available. + # Setting this value lets you select which will be used for + # the wxPython build. Possibilites are 'gtk', 'gtk2' and + # 'x11'. Curently only gtk and gtk2 works. + +BUILD_BASE = "build" # Directory to use for temporary build files. + -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. # Some MSW build settings -FINAL = 1 # Mirrors use of same flag in wx makefiles, +FINAL = 0 # Mirrors use of same flag in wx makefiles, # (0 or 1 only) should probably find a way to # autodetect this... -HYBRID = 0 # If set and not debug or FINAL, then build a +HYBRID = 1 # If set and not debug or FINAL, then build a # hybrid extension that can be used by the # non-debug version of python, but contains # debugging symbols for wxWindows and wxPython. # wxWindows must have been built with /MD, not /MDd # (using FINAL=hybrid will do it.) -WXDLLVER = '233' # Version part of DLL name +WXDLLVER = '250' # Version part of wxWindows DLL name #---------------------------------------------------------------------- @@ -77,17 +113,22 @@ 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: - return '' + rv = '' elif HYBRID: - return 'h' + rv = 'h' else: - return 'd' + rv = 'd' + if UNICODE: + rv = 'u' + rv + return rv #---------------------------------------------------------------------- @@ -96,39 +137,42 @@ def libFlag(): PKGDIR = 'wxPython' wxpExtensions = [] +DATA_FILES = [] 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 +# change the PORT default for wxMac +if sys.platform[:6] == "darwin": + WXPORT = 'mac' -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 +# and do the same for wxMSW, just for consistency +if os.name == 'nt': + WXPORT = 'msw' #---------------------------------------------------------------------- # Check for build flags on the command line #---------------------------------------------------------------------- +# 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', + 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', + 'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', + 'UNDEF_NDEBUG', 'NO_SCRIPTS', 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): - if string.find(sys.argv[x], flag) == 0: - pos = string.find(sys.argv[x], '=') + 1 + if sys.argv[x].find(flag) == 0: + pos = sys.argv[x].find('=') + 1 if pos > 0: vars()[flag] = eval(sys.argv[x][pos:]) sys.argv[x] = '' -for option in ['WX_CONFIG', 'WXDLLVER', ]: +# String options +for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE', 'WXPORT']: for x in range(len(sys.argv)): - if string.find(sys.argv[x], option) == 0: - pos = string.find(sys.argv[x], '=') + 1 + if sys.argv[x].find(option) == 0: + pos = sys.argv[x].find('=') + 1 if pos > 0: vars()[option] = sys.argv[x][pos:] sys.argv[x] = '' @@ -136,6 +180,127 @@ for option in ['WX_CONFIG', 'WXDLLVER', ]: sys.argv = filter(None, sys.argv) +#---------------------------------------------------------------------- +# some helper functions +#---------------------------------------------------------------------- + +def Verify_WX_CONFIG(): + """ Called below for the builds that need wx-config, + if WX_CONFIG is not set then tries to select the specific + wx*-config script based on build options. If not found + then it defaults to 'wx-config'. + """ + # if WX_CONFIG hasn't been set to an explicit value then construct one. + global WX_CONFIG + if WX_CONFIG is None: + if debug: # TODO: Fix this. wxPython's --debug shouldn't be tied to wxWindows... + df = 'd' + else: + df = '' + if UNICODE: + uf = 'u' + else: + uf = '' + ver2 = VERSION[:3] + WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2) + + searchpath = os.environ["PATH"] + for p in searchpath.split(':'): + fp = os.path.join(p, WX_CONFIG) + if os.path.exists(fp) and os.access(fp, os.X_OK): + # success + msg("Found wx-config: " + fp) + WX_CONFIG = fp + break + else: + msg("WX_CONFIG not specified and %s not found on $PATH " + "defaulting to \"wx-config\"" % WX_CONFIG) + WX_CONFIG = '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)) + + 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') + + sources.append(cpp_file) + + if 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] + msg(' '.join(cmd)) + spawn(cmd) + + # copy the generated python file to the package directory + copy_file(py_file, package, update=not force, verbose=0) + + return sources + + + +def contrib_copy_tree(src, dest, verbose=0): + """Update local copies of wxWindows contrib files""" + from distutils.dir_util import mkpath, copy_tree + + mkpath(dest, verbose=verbose) + copy_tree(src, dest, update=1, verbose=verbose) + + + +class smart_install_data(install_data): + def run(self): + #need to change self.install_dir to the actual library dir + install_cmd = self.get_finalized_command('install') + self.install_dir = getattr(install_cmd, 'install_lib') + return install_data.run(self) + + +def build_locale_dir(destdir, verbose=1): + """Build a locale dir under the wxPython package for MSW""" + moFiles = glob.glob(opj(WXDIR, 'locale', '*.mo')) + for src in moFiles: + lang = os.path.splitext(os.path.basename(src))[0] + dest = opj(destdir, lang, 'LC_MESSAGES') + mkpath(dest, verbose=verbose) + copy_file(src, opj(dest, 'wxstd.mo'), update=1, verbose=verbose) + + +def build_locale_list(srcdir): + # get a list of all files under the srcdir, to be used for install_data + def walk_helper(lst, dirname, files): + for f in files: + filename = opj(dirname, f) + if not os.path.isdir(filename): + lst.append( (dirname, [filename]) ) + file_list = [] + os.path.walk(srcdir, walk_helper, file_list) + return file_list + + + + + +#---------------------------------------------------------------------- +# sanity checks + if CORE_ONLY: BUILD_GLCANVAS = 0 BUILD_OGL = 0 @@ -143,6 +308,17 @@ if CORE_ONLY: BUILD_XRC = 0 BUILD_GIZMOS = 0 BUILD_DLLWIDGET = 0 + BUILD_IEWIN = 0 + +if debug: + FINAL = 0 + HYBRID = 0 + +if FINAL: + HYBRID = 0 + +if UNICODE and WXPORT not in ['msw', 'gtk2']: + raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT #---------------------------------------------------------------------- @@ -151,26 +327,23 @@ 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' - if debug: - FINAL = 0 - HYBRID = 0 - - if HYBRID: - FINAL = 0 - includes = ['src', opj(WXDIR, 'lib', 'mswdll' + libFlag()), opj(WXDIR, 'include'), ] - defines = [ ('WIN32', None), # Some of these are no longer - ('__WIN32__', None), # necessary. Anybody know which? + defines = [ ('WIN32', None), + ('__WIN32__', None), ('_WINDOWS', None), ('__WINDOWS__', None), ('WINVER', '0x0400'), @@ -185,64 +358,44 @@ 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 UNDEF_NDEBUG: + defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [opj(WXDIR, 'lib'), 'build\\ilib'] + libdirs = [ opj(WXDIR, 'lib') ] wxdll = 'wxmsw' + WXDLLVER + libFlag() - libs = [wxdll] - - if bcpp_compiling: - libs = ['wx'+WXBCPPLIBVER] + libs = [ wxdll ] libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32', 'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32', - 'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4', + 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4', 'advapi32', 'wsock32'] - cflags = [] #['/GX-'] # workaround for internal compiler error in MSVC on some machines + cflags = [ '/Gy', + # '/GX-' # workaround for internal compiler error in MSVC on some machines + ] lflags = None + # Other MSVC flags... + # To bad I don't remember why I was playing with these, can they be removed? + if FINAL: + pass #cflags = cflags + ['/O1'] + elif HYBRID : + pass #cflags = cflags + ['/Ox'] + else: + pass # cflags = cflags + ['/Od', '/Z7'] + # lflags = ['/DEBUG', ] - 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', ] ## '/PDB:NONE'] +#---------------------------------------------------------------------- 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' @@ -252,50 +405,99 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin": ('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 = [] + libs = ['stdc++'] + + Verify_WX_CONFIG() cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] - cflags = string.split(cflags) + cflags = cflags.split() + if debug: + cflags.append('-g') + cflags.append('-O0') lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] - lflags = string.split(lflags) + lflags = lflags.split() + NO_SCRIPTS = 1 -elif os.name == 'posix': - # Set flags for Unix type platforms +#---------------------------------------------------------------------- +elif os.name == 'posix': + # Set flags for other Unix type platforms WXDIR = '..' # assumes IN_CVS_TREE - WXPLAT = '__WXGTK__' # and assumes GTK... - GENDIR = 'gtk' # Need to allow for Motif eventually too + 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 = [] - cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \ - os.popen('gtk-config --cflags', 'r').read()[:-1] - cflags = string.split(cflags) + Verify_WX_CONFIG() + + cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + portcfg + + cflags = cflags.split() + if debug: + cflags.append('-g') + cflags.append('-O0') lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1] - lflags = string.split(lflags) + 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") + +#---------------------------------------------------------------------- else: - raise 'Sorry Charlie...' + raise 'Sorry Charlie, platform not supported...' + + +#---------------------------------------------------------------------- +# post platform setup checks and tweaks +#---------------------------------------------------------------------- + +if UNICODE: + BUILD_BASE = BUILD_BASE + '.unicode' + VERSION = VERSION + 'u' #---------------------------------------------------------------------- # 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'): + +# Always do it since the version string can change based on the UNICODE flag +open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION) @@ -310,6 +512,9 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword', #'-docstring', '-Sbefore', '-I./src', '-D'+WXPLAT, ] +if UNICODE: + swig_args.append('-DwxUSE_UNICODE') + swig_deps = ['src/my_typemaps.i'] @@ -317,119 +522,123 @@ swig_deps = ['src/my_typemaps.i'] # 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', - ##'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) - - 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 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) +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) - # 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) +copy_file('src/__init__.py', PKGDIR, update=1, verbose=0) +copy_file('src/__version__.py', PKGDIR, update=1, verbose=0) - # 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) +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) - # 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': + build_locale_dir(opj(PKGDIR, 'locale')) + DATA_FILES += build_locale_list(opj(PKGDIR, 'locale')) - # 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) +if os.name == 'nt': + rc_file = ['src/wxc.rc'] +else: + rc_file = [] + + +ext = Extension('wxc', ['src/helpers.cpp', + 'src/drawlist.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) + + +# 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, + include_dirs = includes, + define_macros = defines, + library_dirs = libdirs, + libraries = libs, + extra_compile_args = cflags, + extra_link_args = lflags, + ) +wxpExtensions.append(ext) #---------------------------------------------------------------------- @@ -439,19 +648,19 @@ if not GL_ONLY: CTRB_SRC = opj(WXDIR, 'contrib/src') CTRB_INC = opj(WXDIR, 'contrib/include/wx') -if BUILD_GLCANVAS or GL_ONLY: +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) + USE_SWIG, swig_force, swig_args, swig_deps) gl_libs = [] if os.name == 'posix': gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1] - gl_lflags = string.split(gl_config) + lflags + gl_lflags = gl_config.split() + lflags gl_libs = libs else: other_sources = [opj(location, 'msw/myglcanvas.cpp')] @@ -478,7 +687,7 @@ if BUILD_GLCANVAS or GL_ONLY: # Define the OGL extension module #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_OGL: +if BUILD_OGL: msg('Preparing OGL...') location = 'contrib/ogl' OGLLOC = opj(location, 'contrib/src/ogl') @@ -488,7 +697,7 @@ if not GL_ONLY and BUILD_OGL: 'oglcanvas.i'] swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args) + USE_SWIG, swig_force, swig_args, swig_deps) if IN_CVS_TREE: # make sure local copy of contrib files are up to date @@ -527,7 +736,7 @@ if not GL_ONLY and BUILD_OGL: # Define the STC extension module #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_STC: +if BUILD_STC: msg('Preparing STC...') location = 'contrib/stc' STCLOC = opj(location, 'contrib/src/stc') @@ -543,6 +752,7 @@ if not GL_ONLY and BUILD_STC: 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) @@ -558,7 +768,7 @@ if not GL_ONLY and BUILD_STC: swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], - [opj(STC_H, 'stc.h')]) + [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) @@ -573,6 +783,7 @@ if not GL_ONLY and 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', @@ -598,6 +809,8 @@ if not GL_ONLY and BUILD_STC: '%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, @@ -605,6 +818,7 @@ if not GL_ONLY and BUILD_STC: '%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, @@ -636,17 +850,18 @@ if not GL_ONLY and BUILD_STC: # Define the IEWIN extension module (experimental) #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_IEWIN: +if 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) + USE_SWIG, swig_force, swig_args, swig_deps) ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location, + '%s/wxactivex.cpp' % location, ] + swig_sources, include_dirs = includes, @@ -666,7 +881,7 @@ if not GL_ONLY and BUILD_IEWIN: # Define the XRC extension module #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_XRC: +if BUILD_XRC: msg('Preparing XRC...') location = 'contrib/xrc' XMLLOC = opj(location, 'contrib/src/xrc') @@ -675,7 +890,7 @@ if not GL_ONLY and BUILD_XRC: swig_files = ['xrc.i'] swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args) + USE_SWIG, swig_force, swig_args, swig_deps) xmlres_includes = includes[:] xmlres_includes.append('%s/expat/xmlparse' % XMLLOC) @@ -705,6 +920,7 @@ if not GL_ONLY and BUILD_XRC: '%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, @@ -715,10 +931,12 @@ if not GL_ONLY and BUILD_XRC: '%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, @@ -730,13 +948,8 @@ if not GL_ONLY and BUILD_XRC: '%s/xh_unkwn.cpp' % XMLLOC, '%s/xml.cpp' % XMLLOC, - '%s/xmlbin.cpp' % XMLLOC, - '%s/xmlbinz.cpp' % XMLLOC, - '%s/xmlexpat.cpp' % XMLLOC, - '%s/xmlres.cpp' % XMLLOC, '%s/xmlrsall.cpp' % XMLLOC, - '%s/xmlwrite.cpp' % XMLLOC, ] + swig_sources, @@ -758,7 +971,7 @@ if not GL_ONLY and BUILD_XRC: # Define the GIZMOS extension module #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_GIZMOS: +if BUILD_GIZMOS: msg('Preparing GIZMOS...') location = 'contrib/gizmos' GIZMOLOC = opj(location, 'contrib/src/gizmos') @@ -767,7 +980,7 @@ if not GL_ONLY and BUILD_GIZMOS: swig_files = ['gizmos.i'] swig_sources = run_swig(swig_files, location, '', PKGDIR, - USE_SWIG, swig_force, swig_args) + USE_SWIG, swig_force, swig_args, swig_deps) gizmos_includes = includes[:] gizmos_includes.append(GIZMOINC) @@ -804,13 +1017,13 @@ if not GL_ONLY and BUILD_GIZMOS: # Define the DLLWIDGET extension module #---------------------------------------------------------------------- -if not GL_ONLY and BUILD_DLLWIDGET: +if 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) + USE_SWIG, swig_force, swig_args, swig_deps) # copy a contrib project specific py module to the main package dir copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0) @@ -832,19 +1045,142 @@ if not GL_ONLY and 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) + + #---------------------------------------------------------------------- # 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"]), - ] +if NO_SCRIPTS: + SCRIPTS = None +else: + SCRIPTS = [opj('scripts/helpviewer'), + opj('scripts/img2png'), + opj('scripts/img2xpm'), + opj('scripts/img2py'), + opj('scripts/xrced'), + opj('scripts/pyshell'), + opj('scripts/pycrust'), + opj('scripts/pycwrap'), + ] + +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'))) #---------------------------------------------------------------------- @@ -852,7 +1188,7 @@ TOOLS = [("wxPython/tools", glob.glob("tools/*.py")), #---------------------------------------------------------------------- if __name__ == "__main__": - if not GL_ONLY: + if not PREP_ONLY: setup(name = PKGDIR, version = VERSION, description = DESCRIPTION, @@ -860,40 +1196,31 @@ if __name__ == "__main__": author = AUTHOR, author_email = AUTHOR_EMAIL, url = URL, - licence = LICENCE, + 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', ], ext_package = PKGDIR, ext_modules = wxpExtensions, - ##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, + options = { 'build' : { 'build_base' : BUILD_BASE }}, - py_modules = [ "wxPython.glcanvas" ], + scripts = SCRIPTS, - ext_package = PKGDIR, - ext_modules = wxpExtensions, + cmdclass = { 'install_data': smart_install_data}, + data_files = DATA_FILES, ) - - #---------------------------------------------------------------------- #----------------------------------------------------------------------