#----------------------------------------------------------------------
VER_MAJOR = 2 # The first three must match wxWidgets
-VER_MINOR = 5
-VER_RELEASE = 4
+VER_MINOR = 6
+VER_RELEASE = 1
VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets
-VER_FLAGS = "rc4" # 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 = """\
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.
# 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
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_IEWIN',
+ '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',
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,
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('\\'))
BUILD_DLLWIDGET = 0
BUILD_IEWIN = 0
BUILD_ACTIVEX = 0
+ BUILD_ANIMATE = 0
if debug:
FINAL = 0
WXDIR = '..' # assumes in CVS tree
WXPLAT = '__WXMSW__'
GENDIR = 'msw'
-
+
includes = ['include', 'src',
opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
opj(WXDIR, 'include'),
(WXPLAT, None),
('WXUSINGDLL', '1'),
- ('SWIG_TYPE_TABLE', '_wxPython_table'),
+ ('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
('WXP_USE_THREAD', '1'),
]
elif os.name == 'posix':
WXDIR = '..'
includes = ['include', 'src']
- defines = [('SWIG_TYPE_TABLE', 'wxPython_type_table'),
+ defines = [('SWIG_TYPE_TABLE', WXPYTHON_TYPE_TABLE),
('HAVE_CONFIG_H', None),
('WXP_USE_THREAD', '1'),
]
# 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])
# dirs as includes so we don't have to guess which is correct.
wxfilesdir = ""
-i_subdir = opj("include", "wx", "wxPython", "i_files")
+i_subdir = opj("include", getExtraPath(), "wx", "wxPython", "i_files")
if os.name != "nt":
wxfilesdir = opj(WXPREFIX, i_subdir)
else:
# BuildRenamers
####################################
-import pprint
+import pprint, shutil
try:
import libxml2
FOUND_LIBXML2 = True
# 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