This commit was manufactured by cvs2svn to create tag

'wxPy_last_2_6_merge_point'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_last_2_6_merge_point@36829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2006-01-10 23:49:18 +00:00
parent f58a6c817e
commit bd72e111fa
8491 changed files with 27025 additions and 2978419 deletions

View File

@@ -38,9 +38,9 @@ import distutils.command.clean
VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 6
VER_RELEASE = 1
VER_RELEASE = 2
VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets
VER_FLAGS = "pre" # release flags, such as prerelease or RC num, etc.
VER_FLAGS = "" # release flags, such as prerelease or RC num, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
@@ -55,8 +55,8 @@ LONG_DESCRIPTION = """\
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 = """\
@@ -130,7 +130,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such that multiple versions
# 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
@@ -139,8 +139,14 @@ FLAVOUR = "" # Optional flavour string to be appended to VERSION
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
@@ -148,6 +154,15 @@ WX_CONFIG = None # Usually you shouldn't need to touch this, but you can set
# 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
@@ -246,7 +261,7 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
'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:
@@ -256,8 +271,8 @@ for flag in [ 'BUILD_ACTIVEX', 'BUILD_ANIMATE', 'BUILD_DLLWIDGET',
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:
@@ -273,19 +288,23 @@ 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,
WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
EP_FULL_VER, SYS_WX_CONFIG, WXPORT, MONOLITHIC, FINAL, HYBRID)
try:
from build_options import *
@@ -306,7 +325,7 @@ except:
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.
@@ -335,7 +354,7 @@ def Verify_WX_CONFIG():
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,
@@ -381,7 +400,7 @@ 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('\\'))