#----------------------------------------------------------------------
VER_MAJOR = 2 # The first three must match wxWidgets
-VER_MINOR = 5
-VER_RELEASE = 3
+VER_MINOR = 7
+VER_RELEASE = 0
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS = "p" # release flags, such as prerelease num, unicode, etc.
+VER_FLAGS = "pre" # release flags, such as prerelease or RC num, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
wxPython is a GUI toolkit for Python that is a wrapper around the
wxWidgets C++ GUI library. wxPython provides a large variety of
window types and controls, all implemented with a native look and
-feel (by using the native widgets) on the platforms it is supported
-on.
+feel (by using the native widgets) on the platforms upon which it is
+supported.
"""
CLASSIFIERS = """\
# 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_OGL = 0 # If true, build the contrib/ogl extension module
BUILD_STC = 1 # If true, build the contrib/stc extension module
BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library
+BUILD_ANIMATE = 1 # Build a module for the animate 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.
# Internet Explorer wrapper (experimental)
-BUILD_IEWIN = (os.name == 'nt')
BUILD_ACTIVEX = (os.name == 'nt') # new version of IEWIN and more
# created that adds that dir to the sys.path. In
# addition, a wxselect.py module will be installed
# to site-pacakges that will allow applications to
- # choose a specific version if more than one are
+ # choose a specific version if more than one is
# installed.
FLAVOUR = "" # Optional flavour string to be appended to VERSION
# in MULTIVERSION installs
-EP_ADD_OPTS = 0 # When doing MULTIVERSION installs the wx port and
+EP_ADD_OPTS = 1 # When doing MULTIVERSION installs the wx port and
# ansi/unicode settings can optionally be added to the
# subdir path used in site-packages
-
-
+
+EP_FULL_VER = 0 # When doing MULTIVERSION installs the default is to
+ # put only 2 or 3 (depending on stable/unstable) of
+ # the version compnonents into the "extra path"
+ # subdir of site-packages. Setting this option to
+ # 1 will cause the full 4 components of the version
+ # number to be used instead.
+
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
# version, port, etc. and it will be looked for on the
# default $PATH.
+SYS_WX_CONFIG = None # When installing an in tree build, setup.py uses wx-config
+ # for two different purposes. First, to determine the prefix
+ # where files will be installed, and secondly, to initialise
+ # build_options.py with the correct options for it.
+ # WX_CONFIG is used for the first task. SYS_WX_CONFIG may
+ # be set independently, to the value that should appear in
+ # build_options.py, if it is different to that. The default
+ # is to use the value of WX_CONFIG.
+
WXPORT = 'gtk2' # On Linux/Unix there are several ports of wxWidgets available.
# Setting this value lets you select which will be used for
# the wxPython build. Possibilites are 'gtk', 'gtk2' and
if os.name == 'nt':
WXPORT = 'msw'
+WXPYTHON_TYPE_TABLE = '_wxPython_table'
#----------------------------------------------------------------------
# Check for build flags on the command line
#----------------------------------------------------------------------
# Boolean (int) flags
-for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC',
- 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', 'BUILD_ACTIVEX',
+for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
+ 'BUILD_GIZMOS', 'BUILD_GLCANVAS',
+ 'BUILD_OGL', 'BUILD_STC',
'CORE_ONLY', 'PREP_ONLY', 'USE_SWIG', 'UNICODE',
'UNDEF_NDEBUG', 'NO_SCRIPTS', 'NO_HEADERS', 'BUILD_RENAMERS',
- 'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS',
+ 'FULL_DOCS', 'INSTALL_MULTIVERSION', 'EP_ADD_OPTS', 'EP_FULL_VER',
'MONOLITHIC', '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', 'SWIG',
- 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
+for option in ['WX_CONFIG', 'SYS_WX_CONFIG', 'WXDLLVER', 'BUILD_BASE',
+ 'WXPORT', 'SWIG', 'CONTRIBS_INC', 'WXPY_SRC', 'FLAVOUR',
]:
for x in range(len(sys.argv)):
if sys.argv[x].find(option) == 0:
sys.argv = filter(None, sys.argv)
+#----------------------------------------------------------------------
+# build options file
+#----------------------------------------------------------------------
+
+if SYS_WX_CONFIG is None:
+ SYS_WX_CONFIG = WX_CONFIG
+
+build_options_template = """
+UNICODE=%d
+UNDEF_NDEBUG=%d
+INSTALL_MULTIVERSION=%d
+FLAVOUR="%s"
+EP_ADD_OPTS=%d
+EP_FULL_VER=%d
+WX_CONFIG="%s"
+WXPORT="%s"
+MONOLITHIC=%d
+FINAL=%d
+HYBRID=%d
+""" % (UNICODE, UNDEF_NDEBUG, INSTALL_MULTIVERSION, FLAVOUR, EP_ADD_OPTS,
+ EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
+
+try:
+ from build_options import *
+except:
+ build_options_file = os.path.join(os.path.dirname(__file__), "build_options.py")
+ if not os.path.exists(build_options_file):
+ try:
+ myfile = open(build_options_file, "w")
+ myfile.write(build_options_template)
+ myfile.close()
+ except:
+ print "WARNING: Unable to create build_options.py."
+
+
#----------------------------------------------------------------------
# some helper functions
#----------------------------------------------------------------------
def Verify_WX_CONFIG():
""" Called below for the builds that need wx-config, if WX_CONFIG
- is not set then determins the flags needed based on build
+ is not set then determines the flags needed based on build
options and searches for wx-config on the PATH.
"""
# if WX_CONFIG hasn't been set to an explicit value then construct one.
msg("ERROR: WX_CONFIG not specified and wx-config not found on the $PATH")
# should we exit?
- # TODO: exeucte WX_CONFIG --list and verify a matching config is found
+ # TODO: execute WX_CONFIG --list and verify a matching config is found
def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args,
if not cleaning and USE_SWIG:
for dep in swig_deps:
- if newer(dep, py_file) or newer(dep, cpp_file):
- force = 1
- break
+ # this may fail for external builds, but it's not
+ # a fatal error, so keep going.
+ try:
+ if newer(dep, py_file) or newer(dep, cpp_file):
+ force = 1
+ break
+ except:
+ pass
if force or newer(i_file, py_file) or newer(i_file, cpp_file):
- ## we need forward slashes here even on win32
+ ## 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('\\'))
return ep
-
-
#----------------------------------------------------------------------
# sanity checks
BUILD_STC = 0
BUILD_GIZMOS = 0
BUILD_DLLWIDGET = 0
- BUILD_IEWIN = 0
BUILD_ACTIVEX = 0
+ BUILD_ANIMATE = 0
if debug:
FINAL = 0
if FINAL:
HYBRID = 0
-if UNICODE and WXPORT not in ['msw', 'gtk2']:
+if UNICODE and WXPORT not in ['msw', 'gtk2', 'mac']:
raise SystemExit, "UNICODE mode not currently supported on this WXPORT: "+WXPORT
(WXPLAT, None),
('WXUSINGDLL', '1'),
- ('SWIG_GLOBAL', None),
+ ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
+ ('SWIG_PYTHON_OUTPUT_TUPLE', None),
('WXP_USE_THREAD', '1'),
]
elif os.name == 'posix':
WXDIR = '..'
includes = ['include', 'src']
- defines = [('SWIG_GLOBAL', None),
- ('HAVE_CONFIG_H', None),
+ defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
+ ('SWIG_PYTHON_OUTPUT_TUPLE', None),
('WXP_USE_THREAD', '1'),
]
if UNDEF_NDEBUG:
# uncomment this block to add the right flags to the link step and build
# again.
## if os.uname()[0] == 'SunOS':
+ ## import commands
## libs.append('gcc')
## libdirs.append(commands.getoutput("gcc -print-search-dirs | grep '^install' | awk '{print $2}'")[:-1])
WXPREFIX = os.popen(WX_CONFIG + ' --prefix').read()[:-1]
- if sys.platform[:6] == "darwin":
+ if sys.platform[:6] == "darwin" and WXPORT == 'mac':
# Flags and such for a Darwin (Max OS X) build of Python
WXPLAT = '__WXMAC__'
GENDIR = 'mac'
# SWIG defaults
#----------------------------------------------------------------------
+# *.i files could live in the wxWidgets/wxPython/src dir, or in
+# a subdirectory of the devel package. Let's specify both
+# dirs as includes so we don't have to guess which is correct.
+
+wxfilesdir = ""
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
+if os.name != "nt":
+ wxfilesdir = opj(WXPREFIX, i_subdir)
+else:
+ wxfilesdir = opj(WXPY_SRC, i_subdir)
+
+i_files_includes = [ '-I' + opj(WXPY_SRC, 'src'),
+ '-I' + wxfilesdir ]
+
swig_cmd = SWIG
swig_force = force
swig_args = ['-c++',
- '-Wall',
- '-nodefault',
-
+ #'-Wall',
'-python',
- '-keyword',
'-new_repr',
'-modern',
-
- '-I' + opj(WXPY_SRC, 'src'),
'-D'+WXPLAT,
- '-noruntime'
- ]
+ ] + i_files_includes
+
if UNICODE:
swig_args.append('-DwxUSE_UNICODE')
swig_deps = [ opj(WXPY_SRC, 'src/my_typemaps.i'),
- opj(WXPY_SRC, 'src/my_fragments.i'),
- opj(WXPY_SRC, 'src/common.swg'),
- opj(WXPY_SRC, 'src/pyrun.swg'),
- opj(WXPY_SRC, 'src/python.swg'),
+ opj(WXPY_SRC, 'src/pyfragments.swg'),
]
depends = [ #'include/wx/wxPython/wxPython.h',
# BuildRenamers
####################################
-import pprint
-import xml.sax
-
+import pprint, shutil
try:
import libxml2
FOUND_LIBXML2 = True
#---------------------------------------------------------------------------
-
renamerTemplateStart = """\
// A bunch of %rename directives generated by BuildRenamers in config.py
// in order to remove the wx prefix from all global scope names.
# blow away the old one if they are different.
for dest, temp in [(swigDest, swigDestTemp),
(pyDest, pyDestTemp)]:
+ # NOTE: we don't use shutil.move() because it was introduced
+ # in Python 2.3. Eventually we can switch to it when people
+ # stop building using 2.2.
if not os.path.exists(dest):
- os.rename(temp, dest)
+ shutil.copyfile(temp, dest)
elif open(dest).read() != open(temp).read():
os.unlink(dest)
- os.rename(temp, dest)
+ shutil.copyfile(temp, dest)
else:
print dest + " not changed."
os.unlink(temp)
projects / wxWidgets.git / blobdiff