# flags and values that affect this script
#----------------------------------------------------------------------
-VERSION = "2.3.3pre2u"
+VERSION = "2.3.3pre8"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
URL = "http://wxPython.org/"
-LICENCE = "wxWindows (LGPL derivative)"
+LICENSE = "wxWindows (LGPL derivative)"
LONG_DESCRIPTION = """\
wxPython is a GUI toolkit for Python that is a wrapper around the
wxWindows C++ GUI library. wxPython provides a large variety of
BUILD_STC = 1 # If true, build the contrib/stc extension module
BUILD_XRC = 1 # XML based resource system
BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library
-BUILD_DLLWIDGET = 1# Build a module for that enables unknown wx widgets
- # to be loaded from a DLL to be used from Python.
+BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets
+ # to be loaded from a DLL and to be used from Python.
-BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental)
+ # Internet Explorer wrapper (experimental)
+BUILD_IEWIN = (os.name == 'nt')
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
# for the ugly details
# tree, otherwise will assume all needed files are
# available in the wxPython source distribution
+UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by default defines NDEBUG,
+ # and distutils will pick this up and use it on the
+ # compile command-line for the extensions. This could
+ # conflict with how wxWindows was built. If NDEBUG is
+ # set then wxWindows' __WXDEBUG__ setting will be turned
+ # off. If wxWindows was actually built with it turned
+ # on then you end up with mismatched class structures,
+ # and wxPython will crash.
+
+NO_SCRIPTS = 0 # Don't install the tool scripts
+
+
WX_CONFIG = "wx-config" # Usually you shouldn't need to touch this,
# but you can set it to pass an alternate
# version of wx-config or alternate flags,
# Some MSW build settings
-FINAL = 1 # Mirrors use of same flag in wx makefiles,
+FINAL = 0 # Mirrors use of same flag in wx makefiles,
# (0 or 1 only) should probably find a way to
# autodetect this...
-HYBRID = 0 # If set and not debug or FINAL, then build a
+HYBRID = 1 # If set and not debug or FINAL, then build a
# hybrid extension that can be used by the
# non-debug version of python, but contains
# debugging symbols for wxWindows and wxPython.
# Check for build flags on the command line
#----------------------------------------------------------------------
+# Boolean (int) flags
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
- 'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
+ 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN',
'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE',
+ 'UNDEF_NDEBUG', 'NO_SCRIPTS',
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], flag) == 0:
vars()[flag] = eval(sys.argv[x][pos:])
sys.argv[x] = ''
-for option in ['WX_CONFIG', 'WXDLLVER', ]:
+# String options
+for option in ['WX_CONFIG', 'WXDLLVER', 'BUILD_BASE']:
for x in range(len(sys.argv)):
if string.find(sys.argv[x], option) == 0:
pos = string.find(sys.argv[x], '=') + 1
BUILD_XRC = 0
BUILD_GIZMOS = 0
BUILD_DLLWIDGET = 0
+ BUILD_IEWIN = 0
if UNICODE and os.name != 'nt':
if UNICODE:
BUILD_BASE = BUILD_BASE + '.unicode'
+ VERSION = VERSION + 'u'
#----------------------------------------------------------------------
if not FINAL or HYBRID:
defines.append( ('__WXDEBUG__', None) )
- libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
+ libdirs = [ opj(WXDIR, 'lib') ]
wxdll = 'wxmsw' + WXDLLVER + libFlag()
- libs = [wxdll]
+ libs = [ wxdll ]
if bcpp_compiling:
- libs = ['wx'+WXBCPPLIBVER]
+ libs = [ 'wx'+WXBCPPLIBVER ]
libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
'advapi32', 'wsock32']
- cflags = [
+ cflags = [ '/Gy',
# '/GX-' # workaround for internal compiler error in MSVC on some machines
]
lflags = None
- if bcpp_compiling: # overwrite it
+ if bcpp_compiling: # BCC flags
cflags = ['-5', '-VF', ### To support MSVC spurious semicolons in the class scope
### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
'-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
'@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
]
+ if not FINAL:
+ cflags = cflags + ['/Od', '/v', '/y']
+ lflags = lflags + ['/v', ]
+ else: # MSVC flags
+ if FINAL:
+ pass #cflags = cflags + ['/O1']
+ elif HYBRID :
+ pass #cflags = cflags + ['/Ox']
+ else:
+ pass # cflags = cflags + ['/Od', '/Z7']
+ # lflags = ['/DEBUG', ]
- if not FINAL and HYBRID and not bcpp_compiling:
- cflags = cflags + ['/Od', '/Z7']
- lflags = ['/DEBUG', ]
-
- elif bcpp_compiling and not FINAL:
- cflags = cflags + ['/Od', '/v', '/y']
- lflags = lflags + ['/v', ]
cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
cflags = string.split(cflags)
+ if UNDEF_NDEBUG:
+ cflags.append('-UNDEBUG')
+ if debug:
+ cflags.append('-g')
+ cflags.append('-O0')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = string.split(lflags)
+ NO_SCRIPTS = 1
elif os.name == 'posix':
cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
os.popen('gtk-config --cflags', 'r').read()[:-1]
cflags = string.split(cflags)
+ if UNDEF_NDEBUG:
+ cflags.append('-UNDEBUG')
+ if debug:
+ cflags.append('-g')
+ cflags.append('-O0')
lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
lflags = string.split(lflags)
# Check if the version file needs updated
#----------------------------------------------------------------------
-if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
- open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
+#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
+open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
'printfw.i', 'sizers.i', 'clip_dnd.i',
- 'filesys.i', 'streams.i', 'utils.i'
+ 'filesys.i', 'streams.i', 'utils.i', 'fonts.i'
]
swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)
- if IN_CVS_TREE: # update the licence files
+ if IN_CVS_TREE: # update the license files
mkpath('licence')
for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']:
copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0)
wxpExtensions.append(ext)
+ # Extension for the wizard module
+ swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
+ USE_SWIG, swig_force, swig_args, swig_deps)
+ ext = Extension('wizardc', swig_sources,
+ include_dirs = includes,
+ define_macros = defines,
+ library_dirs = libdirs,
+ libraries = libs,
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+ wxpExtensions.append(ext)
+
+
#----------------------------------------------------------------------
# Define the GLCanvas extension module
#----------------------------------------------------------------------
ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
+ '%s/wxactivex.cpp' % location,
] + swig_sources,
include_dirs = includes,
# Tools and scripts
#----------------------------------------------------------------------
-TOOLS = [("wxPython/tools", glob.glob("tools/*.py")),
- ("wxPython/tools/XRCed", glob.glob("tools/XRCed/*.py") +
- glob.glob("tools/XRCed/*.xrc") +
- ["tools/XRCed/CHANGES",
- "tools/XRCed/TODO",
- "tools/XRCed/README"]),
- ]
+## TOOLS = [("wxPython/tools", glob.glob("tools/*.py")),
+## ("wxPython/tools/XRCed", glob.glob("tools/XRCed/*.py") +
+## glob.glob("tools/XRCed/*.xrc") +
+## ["tools/XRCed/CHANGES",
+## "tools/XRCed/TODO",
+## "tools/XRCed/README"]),
+## ]
+if NO_SCRIPTS:
+ SCRIPTS = None
+else:
+ SCRIPTS = [opj('scripts/img2png'),
+ opj('scripts/img2xpm'),
+ opj('scripts/img2py'),
+ opj('scripts/xrced'),
+ opj('scripts/pyshell'),
+ opj('scripts/pycrust'),
+ ]
#----------------------------------------------------------------------
author = AUTHOR,
author_email = AUTHOR_EMAIL,
url = URL,
- licence = LICENCE,
+ license = LICENSE,
packages = [PKGDIR,
PKGDIR+'.lib',
PKGDIR+'.lib.editor',
PKGDIR+'.lib.mixins',
PKGDIR+'.lib.PyCrust',
+ PKGDIR+'.tools',
+ PKGDIR+'.tools.XRCed',
],
ext_package = PKGDIR,
ext_modules = wxpExtensions,
- options = { 'build' : { 'build_base' : BUILD_BASE }}
+ options = { 'build' : { 'build_base' : BUILD_BASE }},
##data_files = TOOLS,
+ scripts = SCRIPTS,
)
else:
author = AUTHOR,
author_email = AUTHOR_EMAIL,
url = URL,
- licence = LICENCE,
+ license = LICENSE,
py_modules = [ "wxPython.glcanvas" ],
projects / wxWidgets.git / blobdiff