#!/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_MINOR = 5
VER_RELEASE = 1
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWindows
-VER_FLAGS = "p3" # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS = "p8" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
# to be loaded from a DLL and to be used from Python.
# Internet Explorer wrapper (experimental)
-BUILD_IEWIN = 0 #(os.name == 'nt')
+BUILD_IEWIN = (os.name == 'nt')
CORE_ONLY = 0 # if true, don't build any of the above
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(':'):
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:
i_file = os.path.join(dir, file)
py_file = os.path.join(dir, gendir, basefile+'.py')
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)
#i_file = opj(i_file) #'/'.join(i_file.split('\\'))
if BUILD_RENAMERS:
- # first run 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',
- i_file, '-D'+WXPLAT, ] + \
- [x for x in swig_args if x.startswith('-I')]
+ './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, i_file]
+ cmd = [ swig_cmd ] + swig_args + ['-I'+dir, '-o', cpp_file,
+ '-xmlout', xml_file, i_file]
msg(' '.join(cmd))
spawn(cmd)
if UNDEF_NDEBUG:
defines.append( ('NDEBUG',) ) # using a 1-tuple makes it do an undef
+ if HYBRID:
+ defines.append( ('__NO_VC_CRTDBG__', None) )
if not FINAL or HYBRID:
defines.append( ('__WXDEBUG__', None) )
libdirs = []
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:
'-I./src',
'-D'+WXPLAT,
- '-c'
+ '-noruntime'
]
if UNICODE:
swig_args.append('-DwxUSE_UNICODE')
msg('Preparing CORE...')
swig_sources = run_swig(['core.i'], 'src', GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps +
- [ 'src/_app.i',
+ [ 'src/_accel.i',
+ 'src/_app.i',
'src/_app_ex.py',
'src/_constraints.i',
'src/_core_api.i',
USE_SWIG, swig_force, swig_args, swig_deps +
['src/_windows_rename.i', 'src/_windows_reverse.txt',
'src/_panel.i',
- 'src/_accel.i',
'src/_toplvl.i', 'src/_statusbar.i',
'src/_splitter.i', 'src/_sashwin.i',
'src/_popupwin.i', 'src/_tipwin.i',
'src/_misc.i', 'src/_tipdlg.i',
'src/_timer.i', 'src/_log.i',
'src/_process.i', 'src/_joystick.i',
- 'src/_wave.i', 'src/_mimetype.i',
+ 'src/_sound.i', 'src/_mimetype.i',
'src/_artprov.i', 'src/_config.i',
'src/_datetime.i', 'src/_dataobj.i',
'src/_dnd.i',
msg('Preparing OGL...')
location = 'contrib/ogl'
- swig_sources = run_swig(['ogl.i'], location, '', PKGDIR,
+ 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,
ext = Extension('_ogl',
swig_sources,
- include_dirs = includes,
+ include_dirs = includes + [ location ],
define_macros = defines + [('wxUSE_DEPRECATED', '0')],
library_dirs = libdirs,
else:
STC_H = opj(WXPREFIX, 'include/wx/stc')
-## NOTE: need to add this to the stc.bkl...
+## NOTE: need to add something like this to the stc.bkl...
## # 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
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,
msg('Preparing GIZMOS...')
location = 'contrib/gizmos'
- swig_sources = run_swig(['gizmos.i'], location, '', PKGDIR,
+ swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
USE_SWIG, swig_force, swig_args, swig_deps)
ext = Extension('_gizmos',
[ '%s/treelistctrl.cpp' % location ] + swig_sources,
- include_dirs = includes,
+ include_dirs = includes + [ location ],
define_macros = defines,
library_dirs = libdirs,
]
-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')
'wx.lib.editor',
'wx.lib.mixins',
'wx.py',
- 'wx.py.wxd',
'wx.tools',
'wx.tools.XRCed',
],
projects / wxWidgets.git / blobdiff