if USE_SWIG:
try:
- # It may come on either stdout or stderr, depending on the
- # version, so read both.
- i, o, e = os.popen3(SWIG + ' -version', 't')
- stext = o.read() + e.read()
- import re
- match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE)
- if not match:
- raise 'NotFound'
- SVER = match.group(0)
+ SVER = swig_version()
open('include/wx/wxPython/swigver.h', 'w').write('''\
// This file was generated by setup.py
#define wxPy_SWIG_VERSION "SWIG-%s"
''' % SVER)
msg('Using SWIG-' + SVER)
-
except:
msg('\nUnable to get SWIG version number\n')
+
#----------------------------------------------------------------------
# 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/_bitmap.i',
'src/_colour.i',
'src/_dc.i',
+ 'src/_graphics.i',
+ 'src/_overlay.i',
'src/_gdiobj.i',
'src/_imaglist.i',
'src/_region.i',
'src/_pen.i',
'src/_palette.i',
'src/_renderer.i',
+ 'src/_pseudodc.i',
],
True)
-ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
+ext = Extension('_gdi_', ['src/drawlist.cpp',
+ 'src/pseudodc.cpp'
+ ] + swig_sources,
include_dirs = includes,
define_macros = defines,
library_dirs = libdirs,
# 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/_panel.i',
'src/_toplvl.i',
'src/_statusbar.i',
'src/_splitter.i',
# 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/_toolbar.i',
+ [ 'src/_toolbar.i',
'src/_button.i',
'src/_checkbox.i',
'src/_choice.i',
'src/_cshelp.i',
'src/_dragimg.i',
'src/_datectrl.i',
+ 'src/_hyperlink.i',
+ 'src/_picker.i',
+ 'src/_collpane.i',
],
True)
ext = Extension('_controls_', swig_sources,
# Extension for the misc module
swig_sources = run_swig(['misc.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
- [ 'src/__misc_rename.i',
- 'src/__misc_reverse.txt',
- 'src/_settings.i',
+ [ 'src/_settings.i',
'src/_functions.i',
'src/_misc.i',
'src/_tipdlg.i',
'src/_display.i',
'src/_clipbrd.i',
'src/_stdpaths.i',
+ 'src/_power.i',
+ 'src/_about.i',
],
True)
ext = Extension('_misc_', swig_sources,
wxpExtensions.append(ext)
+swig_sources = run_swig(['combo.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_combo', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ **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,
mediaLibs = libs[:]
-if not MONOLITHIC and os.name == 'nt':
- mediaLibs.append(makeLibName('media')[0])
+if not MONOLITHIC and findLib('media', libdirs):
+ mediaLibs += makeLibName('media')
swig_sources = run_swig(['media.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('_media', swig_sources,
swig_sources = run_swig(['xrc.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
- [ 'src/_xrc_rename.i',
- 'src/_xrc_ex.py',
+ [ 'src/_xrc_ex.py',
'src/_xmlres.i',
'src/_xmlsub.i',
'src/_xml.i',
'src/_xmlhandler.i',
])
+
+if not MONOLITHIC and findLib('xrc', libdirs):
+ xrcLib = makeLibName('xrc')
+else:
+ xrcLib = []
ext = Extension('_xrc',
swig_sources,
include_dirs = includes + CONTRIBS_INC,
define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs + xrcLib,
+
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+wxpExtensions.append(ext)
+
+
+
+swig_sources = run_swig(['richtext.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+if not MONOLITHIC and findLib('richtext', libdirs):
+ richLib = makeLibName('richtext')
+else:
+ richLib = []
+ext = Extension('_richtext', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs + richLib,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ **depends
+ )
+wxpExtensions.append(ext)
+
+
+
+swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force,
+ swig_args + ['-I'+opj(WXDIR, 'include/wx/aui')],
+ swig_deps + ['src/_aui_docstrings.i',
+ opj(WXDIR, 'include/wx/aui/framemanager.h'),
+ opj(WXDIR, 'include/wx/aui/floatpane.h'),
+ opj(WXDIR, 'include/wx/aui/dockart.h'),
+ opj(WXDIR, 'include/wx/aui/auibook.h'),
+ ])
+if not MONOLITHIC and findLib('aui', libdirs):
+ auiLib = makeLibName('aui')
+else:
+ auiLib = []
+ext = Extension('_aui', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs + auiLib,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ **depends
+ )
+wxpExtensions.append(ext)
+
+
+swig_sources = run_swig(['animate.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ext = Extension('_animate',
+ swig_sources,
+
+ include_dirs = includes + CONTRIBS_INC,
+ define_macros = defines,
+
library_dirs = libdirs,
libraries = libs,
extra_compile_args = cflags,
extra_link_args = lflags,
)
+
wxpExtensions.append(ext)
+
+
#----------------------------------------------------------------------
# Define the GLCanvas extension module
#----------------------------------------------------------------------
USE_SWIG, swig_force, swig_args, swig_deps)
gl_libs = []
+ gl_libdirs = libdirs[:]
if os.name == 'posix':
gl_config = os.popen(WX_CONFIG + ' --libs gl', 'r').read()[:-1]
- gl_lflags = gl_config.split() + lflags
- gl_libs = libs
+ gl_lflags = gl_config.split()
+ gl_lflags = adjustLFLAGS(gl_lflags, gl_libdirs, gl_libs)
+
+
else:
gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
gl_lflags = lflags
include_dirs = includes + CONTRIBS_INC,
define_macros = defines,
- library_dirs = libdirs,
+ library_dirs = gl_libdirs,
libraries = gl_libs,
extra_compile_args = cflags,
location = 'contrib/gizmos'
swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
+ USE_SWIG, swig_force, swig_args, swig_deps +
+ [ '%s/_treelist.i' % location])
ext = Extension('_gizmos',
[ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,
wxpExtensions.append(ext)
-#----------------------------------------------------------------------
-# Define the ANIMATE extension module
-#----------------------------------------------------------------------
-
-if BUILD_ANIMATE:
- msg('Preparing ANIMATE...')
- location = 'contrib/animate'
-
- swig_sources = run_swig(['animate.i'], location, GENDIR, PKGDIR,
- USE_SWIG, swig_force, swig_args, swig_deps)
-
- ext = Extension('_animate',
- swig_sources,
-
- include_dirs = includes + CONTRIBS_INC,
- define_macros = defines,
-
- library_dirs = libdirs,
- libraries = libs + makeLibName('animate'),
-
- extra_compile_args = cflags,
- extra_link_args = lflags,
- )
-
- wxpExtensions.append(ext)
-
-
-
#----------------------------------------------------------------------
# Define the DLLWIDGET extension module
#----------------------------------------------------------------------
i_files = glob.glob(opj("src/*.i")) + \
glob.glob(opj("src/_*.py")) + \
glob.glob(opj("src/*.swg"))
+ if BUILD_GLCANVAS:
+ i_files += glob.glob(opj("contrib/glcanvas/*.i"))
HEADERS = zip(h_files, ["/wxPython"]*len(h_files)) + \
zip(i_files, ["/wxPython/i_files"]*len(i_files))
'wx',
'wx.build',
'wx.lib',
+ 'wx.lib.analogclock',
+ 'wx.lib.analogclock.lib_setup',
+ 'wx.lib.art',
'wx.lib.colourchooser',
'wx.lib.editor',
'wx.lib.floatcanvas',
},
)
+ setup(name = 'wxaddons',
+ 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 = ['wxaddons']
+ )
if INSTALL_MULTIVERSION:
setup(name = 'wxPython-common',
projects / wxWidgets.git / blobdiff