This commit was manufactured by cvs2svn to create tag 'wxPy_2_3_4_1'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_3_4_1@18324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
|
||||
# flags and values that affect this script
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
VERSION = "2.3.3pre8"
|
||||
VERSION = "2.3.4.1"
|
||||
DESCRIPTION = "Cross platform GUI toolkit for Python"
|
||||
AUTHOR = "Robin Dunn"
|
||||
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
|
||||
@@ -39,6 +39,12 @@ BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets
|
||||
# Internet Explorer wrapper (experimental)
|
||||
BUILD_IEWIN = (os.name == 'nt')
|
||||
|
||||
BUILD_CANVAS = 0 # Build a canvas module using the one in wx/contrib (experimental)
|
||||
BUILD_ART2D = 0 # Build a canvas module using code from the wxArt2D project (experimental)
|
||||
|
||||
|
||||
|
||||
|
||||
CORE_ONLY = 0 # if true, don't build any of the above
|
||||
|
||||
GL_ONLY = 0 # Only used when making the -gl RPM. See the "b" script
|
||||
@@ -87,7 +93,7 @@ HYBRID = 1 # If set and not debug or FINAL, then build a
|
||||
# wxWindows must have been built with /MD, not /MDd
|
||||
# (using FINAL=hybrid will do it.)
|
||||
|
||||
WXDLLVER = '233' # Version part of wxWindows DLL name
|
||||
WXDLLVER = '234' # Version part of wxWindows DLL name
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
@@ -176,6 +182,13 @@ if CORE_ONLY:
|
||||
BUILD_DLLWIDGET = 0
|
||||
BUILD_IEWIN = 0
|
||||
|
||||
if debug:
|
||||
FINAL = 0
|
||||
HYBRID = 0
|
||||
|
||||
if FINAL:
|
||||
HYBRID = 0
|
||||
|
||||
|
||||
if UNICODE and os.name != 'nt':
|
||||
print "UNICODE is currently only supported on Win32"
|
||||
@@ -203,13 +216,6 @@ if os.name == 'nt':
|
||||
WXPLAT = '__WXMSW__'
|
||||
GENDIR = 'msw'
|
||||
|
||||
if debug:
|
||||
FINAL = 0
|
||||
HYBRID = 0
|
||||
|
||||
if HYBRID:
|
||||
FINAL = 0
|
||||
|
||||
includes = ['src',
|
||||
opj(WXDIR, 'lib', 'mswdll' + libFlag()),
|
||||
opj(WXDIR, 'include'),
|
||||
@@ -305,7 +311,7 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
|
||||
('WXP_USE_THREAD', '1'),
|
||||
]
|
||||
libdirs = []
|
||||
libs = []
|
||||
libs = ['stdc++']
|
||||
|
||||
cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
|
||||
cflags = string.split(cflags)
|
||||
@@ -319,14 +325,15 @@ elif os.name == 'posix' and sys.platform[:6] == "darwin":
|
||||
lflags = string.split(lflags)
|
||||
|
||||
NO_SCRIPTS = 1
|
||||
BUILD_DLLWIDGET = 0
|
||||
|
||||
|
||||
elif os.name == 'posix':
|
||||
# Set flags for Unix type platforms
|
||||
# Set flags for other Unix type platforms
|
||||
|
||||
WXDIR = '..' # assumes IN_CVS_TREE
|
||||
WXPLAT = '__WXGTK__' # and assumes GTK...
|
||||
GENDIR = 'gtk' # Need to allow for Motif eventually too
|
||||
GENDIR = 'gtk' # Need to allow for X11 and/or Motif eventually too
|
||||
|
||||
includes = ['src']
|
||||
defines = [('SWIG_GLOBAL', None),
|
||||
@@ -348,6 +355,12 @@ elif os.name == 'posix':
|
||||
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
|
||||
lflags = string.split(lflags)
|
||||
|
||||
# Some distros (e.g. Mandrake) put libGLU in /usr/X11R6/lib, but
|
||||
# wx-config doesn't output that for some reason. For now, just
|
||||
# add it unconditionally but we should really check if the lib is
|
||||
# really found there or wx-config should be fixed.
|
||||
libdirs.append("/usr/X11R6/lib")
|
||||
|
||||
|
||||
else:
|
||||
raise 'Sorry Charlie...'
|
||||
@@ -357,7 +370,9 @@ else:
|
||||
# Check if the version file needs updated
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
|
||||
# Always do it since the version string can change based on the UNICODE flag
|
||||
|
||||
##if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
|
||||
open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
|
||||
|
||||
|
||||
@@ -786,6 +801,7 @@ if not GL_ONLY and BUILD_XRC:
|
||||
'%s/xh_radbt.cpp' % XMLLOC,
|
||||
'%s/xh_radbx.cpp' % XMLLOC,
|
||||
'%s/xh_scrol.cpp' % XMLLOC,
|
||||
'%s/xh_scwin.cpp' % XMLLOC,
|
||||
|
||||
'%s/xh_sizer.cpp' % XMLLOC,
|
||||
'%s/xh_slidr.cpp' % XMLLOC,
|
||||
@@ -898,6 +914,119 @@ if not GL_ONLY and BUILD_DLLWIDGET:
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Define the CANVAS extension module
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if not GL_ONLY and BUILD_CANVAS:
|
||||
msg('Preparing CANVAS...')
|
||||
location = 'contrib/canvas'
|
||||
CANVASLOC = opj(location, 'contrib/src/canvas')
|
||||
CANVASINC = opj(location, 'contrib/include')
|
||||
|
||||
swig_files = ['canvas.i']
|
||||
|
||||
swig_sources = run_swig(swig_files, location, '', PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
|
||||
if IN_CVS_TREE:
|
||||
# make sure local copy of contrib files are up to date
|
||||
contrib_copy_tree(opj(CTRB_INC, 'canvas'), opj(CANVASINC, 'wx/canvas'))
|
||||
contrib_copy_tree(opj(CTRB_SRC, 'canvas'), CANVASLOC)
|
||||
|
||||
ext = Extension('canvasc', ['%s/bbox.cpp' % CANVASLOC,
|
||||
'%s/liner.cpp' % CANVASLOC,
|
||||
'%s/polygon.cpp' % CANVASLOC,
|
||||
'%s/canvas.cpp' % CANVASLOC,
|
||||
] + swig_sources,
|
||||
|
||||
include_dirs = [CANVASINC] + includes,
|
||||
define_macros = defines,
|
||||
|
||||
library_dirs = libdirs,
|
||||
libraries = libs,
|
||||
|
||||
extra_compile_args = cflags,
|
||||
extra_link_args = lflags,
|
||||
)
|
||||
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Define the ART2D extension module
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if not GL_ONLY and BUILD_ART2D:
|
||||
msg('Preparing ART2D...')
|
||||
location = 'contrib/art2d'
|
||||
ART2DLOC = opj(location, 'modules/canvas/src')
|
||||
ART2DINC = opj(location, 'modules/canvas/include')
|
||||
EXPATLOC = opj(location, 'modules/expat')
|
||||
EXPATINC = opj(location, 'modules/expat/include')
|
||||
|
||||
swig_files = ['art2d.i',
|
||||
'art2d_misc.i',
|
||||
'art2d_base.i',
|
||||
'art2d_canvas.i',
|
||||
]
|
||||
|
||||
swig_sources = run_swig(swig_files, location, '', PKGDIR,
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
|
||||
if IN_CVS_TREE:
|
||||
# Don't copy data in this case as the code snapshots are
|
||||
# taken manually
|
||||
pass
|
||||
|
||||
ext = Extension('art2dc', [ opj(ART2DLOC, 'afmatrix.cpp'),
|
||||
opj(ART2DLOC, 'bbox.cpp'),
|
||||
opj(ART2DLOC, 'cancom.cpp'),
|
||||
opj(ART2DLOC, 'candoc.cpp'),
|
||||
opj(ART2DLOC, 'canglob.cpp'),
|
||||
opj(ART2DLOC, 'canobj3d.cpp'),
|
||||
opj(ART2DLOC, 'canobj.cpp'),
|
||||
opj(ART2DLOC, 'canprim.cpp'),
|
||||
opj(ART2DLOC, 'canprop.cpp'),
|
||||
opj(ART2DLOC, 'canvas.cpp'),
|
||||
opj(ART2DLOC, 'docviewref.cpp'),
|
||||
opj(ART2DLOC, 'drawer.cpp'),
|
||||
opj(ART2DLOC, 'eval.cpp'),
|
||||
opj(ART2DLOC, 'graph.cpp'),
|
||||
opj(ART2DLOC, 'layerinf.cpp'),
|
||||
opj(ART2DLOC, 'liner.cpp'),
|
||||
opj(ART2DLOC, 'meta.cpp'),
|
||||
opj(ART2DLOC, 'objlist.cpp'),
|
||||
opj(ART2DLOC, 'polygon.cpp'),
|
||||
opj(ART2DLOC, 'recur.cpp'),
|
||||
opj(ART2DLOC, 'rendimg.cpp'),
|
||||
opj(ART2DLOC, 'tools.cpp'),
|
||||
opj(ART2DLOC, 'vpath.cpp'),
|
||||
opj(ART2DLOC, 'xmlpars.cpp'),
|
||||
|
||||
opj(EXPATLOC, 'xmlparse/xmlparse.c'),
|
||||
opj(EXPATLOC, 'xmltok/xmlrole.c'),
|
||||
opj(EXPATLOC, 'xmltok/xmltok.c'),
|
||||
|
||||
] + swig_sources,
|
||||
|
||||
include_dirs = [ ART2DINC,
|
||||
EXPATINC,
|
||||
opj(EXPATLOC, 'xmltok'),
|
||||
opj(EXPATLOC, 'xmlparse'),
|
||||
] + includes,
|
||||
define_macros = defines,
|
||||
|
||||
library_dirs = libdirs,
|
||||
libraries = libs,
|
||||
|
||||
extra_compile_args = cflags,
|
||||
extra_link_args = lflags,
|
||||
)
|
||||
|
||||
wxpExtensions.append(ext)
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Tools and scripts
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user