#!/usr/bin/env python
#----------------------------------------------------------------------
-import sys, os, glob, fnmatch
+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
VER_MAJOR = 2 # The first three must match wxWindows
VER_MINOR = 5
-VER_RELEASE = 0
+VER_RELEASE = 1
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS = "p1" # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS = "p7" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
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
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.
# 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
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
# 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)
#----------------------------------------------------------------------
# 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":
# 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:
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
else:
uf = ''
ver2 = "%s.%s" % (VER_MAJOR, VER_MINOR)
- WX_CONFIG = 'wx%s%s%s-%s-config' % (WXPORT, uf, df, ver2)
+ 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(':'):
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)
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
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 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',
#----------------------------------------------------------------------
-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]
-#----------------------------------------------------------------------
+ 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)
#----------------------------------------------------------------------
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
+VERSION_STRING = '%(VERSION)s'
+MAJOR_VERSION = %(VER_MAJOR)s
+MINOR_VERSION = %(VER_MINOR)s
+RELEASE_VERSION = %(VER_RELEASE)s
+SUBREL_VERSION = %(VER_SUBREL)s
-wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
- wxSUBREL_VERSION, '%(VER_FLAGS)s')
+VERSION = (MAJOR_VERSION, MINOR_VERSION, RELEASE_VERSION,
+ SUBREL_VERSION, '%(VER_FLAGS)s')
-wxRELEASE_NUMBER = wxRELEASE_VERSION # for compatibility
+RELEASE_NUMBER = RELEASE_VERSION # for compatibility
""" % globals())
# 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',
+ ]
#----------------------------------------------------------------------
#----------------------------------------------------------------------
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':
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,
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 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)
-# Extension for the calendar module
+
+##
+## 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 = []
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,
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(['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,
+ ])
- swig_sources = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('_ogl',
+ swig_sources,
- 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,
-
- 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,
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/PlatWX.cpp' % STCLOC,
- '%s/ScintillaWX.cpp' % STCLOC,
- '%s/stc.cpp' % STCLOC,
-
- '%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/XPM.cxx' % STCLOC,
- ]
- + glob.glob('%s/scintilla/src/Lex*.cxx' % 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,
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,
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(['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 = run_swig(swig_files, location, '', PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('_xrc',
+ swig_sources,
- 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,
-
- ] + glob.glob('%s/xh_*.cpp' % XMLLOC) +
-
- [ '%s/xml.cpp' % XMLLOC,
- '%s/xmlres.cpp' % XMLLOC,
- '%s/xmlrsall.cpp' % XMLLOC,
- ] + 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,
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)
-
+ ext = Extension('_gizmos',
+ [ '%s/treelistctrl.cpp' % location ] + swig_sources,
- # 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/splittree.cpp' % GIZMOLOC,
- '%s/ledctrl.cpp' % GIZMOLOC,
- #'%s/multicell.cpp' % GIZMOLOC,
-
- '%s/treelistctrl.cpp' % location,
-
- ] + 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,
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)
#----------------------------------------------------------------------
]
-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/tools/XRCed', '*.txt', '*.xrc')
+DATA_FILES += find_data_files('wx/py', '*.txt', '*.ico', '*.css', '*.html')
DATA_FILES += find_data_files('wx', '*.txt', '*.css', '*.html')
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,
+ platforms = PLATFORMS,
+ classifiers = filter(None, CLASSIFIERS.split("\n")),
+ keywords = KEYWORDS,
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.editor',
'wx.lib.mixins',
'wx.py',
+ 'wx.py.wxd',
'wx.tools',
'wx.tools.XRCed',
],
projects / wxWidgets.git / blobdiff