# flags and values that affect this script
#----------------------------------------------------------------------
-VERSION = "2.3.2b6"
+VERSION = "2.3.2b7+"
DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>"
BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
BUILD_OGL = 1 # If true, build the contrib/ogl extension module
BUILD_STC = 1 # If true, build the contrib/stc extension module
-BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental)
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 the gizmos contrib library
+BUILD_IEWIN = 0 # Internet Explorer wrapper (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
# for the ugly details
# wxWindows must have been built with /MD, not /MDd
# (using FINAL=hybrid will do it.)
-WXDLLVER = '23_2' # Version part of DLL name
+WXDLLVER = '232' # Version part of DLL name
#----------------------------------------------------------------------
path = apply(os.path.join, args)
return os.path.normpath(path)
+def libFlag():
+ if FINAL:
+ return ''
+ elif HYBRID:
+ return 'h'
+ else:
+ return 'd'
+
+
#----------------------------------------------------------------------
# Some other globals
#----------------------------------------------------------------------
#----------------------------------------------------------------------
for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC',
+ 'BUILD_GIZMOS', 'BUILD_DLLWIDGET',
'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE',
'FINAL', 'HYBRID', ]:
for x in range(len(sys.argv)):
BUILD_OGL = 0
BUILD_STC = 0
BUILD_XRC = 0
+ BUILD_GIZMOS = 0
+ BUILD_DLLWIDGET = 0
+
#----------------------------------------------------------------------
# Setup some platform specific stuff
FINAL = 0
includes = ['src',
+ opj(WXDIR, 'lib', 'mswdll' + libFlag()),
opj(WXDIR, 'include'),
]
defines.append( ('__WXDEBUG__', None) )
libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
-
- if FINAL:
- wxdll = 'wx' + WXDLLVER
- elif HYBRID:
- wxdll = 'wx' + WXDLLVER + 'h'
- else:
- wxdll = 'wx' + WXDLLVER + 'd'
-
-
+ wxdll = 'wxmsw' + WXDLLVER + libFlag()
libs = [wxdll]
+
if bcpp_compiling:
libs = ['wx'+WXBCPPLIBVER]
if bcpp_compiling: # overwrite it
- cflags = ['-5', '-VF', ### To supplort MSVC spurious semicolons in the class scope
+ 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')
+elif os.name == 'posix' and sys.platform[:6] == "darwin":
+ # Flags and such for a Darwin (Max OS X) build of Python
+
+ WXDIR = '..' # assumes IN_CVS_TREE
+ WXPLAT = '__WXMAC__'
+ GENDIR = 'mac'
+
+ includes = ['src']
+ defines = [('SWIG_GLOBAL', None),
+ ('HAVE_CONFIG_H', None),
+ ('WXP_USE_THREAD', '1'),
+ ]
+ libdirs = []
+ libs = []
+
+ cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1]
+ cflags = string.split(cflags)
+
+ lflags = os.popen(WX_CONFIG + ' --libs', 'r').read()[:-1]
+ lflags = string.split(lflags)
+
+
+
elif os.name == 'posix':
# Set flags for Unix type platforms
libdirs = []
libs = []
- cflags = os.popen(WX_CONFIG + ' --cflags', 'r').read()[:-1] + ' ' + \
+ cflags = os.popen(WX_CONFIG + ' --cxxflags', 'r').read()[:-1] + ' ' + \
os.popen('gtk-config --cflags', 'r').read()[:-1]
cflags = string.split(cflags)
'-dnone',
#'-dascii',
#'-docstring', '-Sbefore',
- '-I./src', '-D'+WXPLAT]
+ '-I./src', '-D'+WXPLAT,
+ ]
swig_deps = ['src/my_typemaps.i']
swig_files = ['stc_.i']
- swig_sources = run_swig(swig_files, location, '', PKGDIR,
+ swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
USE_SWIG, swig_force,
swig_args + ['-I'+STC_H, '-I'+location],
[opj(STC_H, 'stc.h')])
- # copy a project specific py module to the main package dir
+ # copy a contrib project specific py module to the main package dir
copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0)
# add some include dirs to the standard set
'%s/scintilla/src/RESearch.cxx' % STCLOC,
'%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
'%s/scintilla/src/Style.cxx' % STCLOC,
+ '%s/scintilla/src/StyleContext.cxx' % STCLOC,
'%s/scintilla/src/UniConversion.cxx' % STCLOC,
'%s/scintilla/src/ViewStyle.cxx' % STCLOC,
'%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
'%s/scintilla/src/LexAda.cxx' % STCLOC,
'%s/scintilla/src/LexAVE.cxx' % STCLOC,
- '%s/scintilla/src/LexConf.cxx' % STCLOC,
'%s/scintilla/src/LexCPP.cxx' % STCLOC,
+ '%s/scintilla/src/LexConf.cxx' % STCLOC,
+ '%s/scintilla/src/LexCrontab.cxx' % STCLOC,
'%s/scintilla/src/LexEiffel.cxx' % STCLOC,
'%s/scintilla/src/LexHTML.cxx' % STCLOC,
'%s/scintilla/src/LexLisp.cxx' % STCLOC,
+#----------------------------------------------------------------------
+# Define the GIZMOS extension module
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_GIZMOS:
+ msg('Preparing GIZMOS...')
+ location = 'contrib/gizmos'
+ GIZMOLOC = opj(location, 'contrib/src/gizmos')
+ GIZMOINC = opj(location, 'contrib/include')
+
+ swig_files = ['gizmos.i']
+
+ swig_sources = run_swig(swig_files, location, '', PKGDIR,
+ USE_SWIG, swig_force, swig_args)
+
+ gizmos_includes = includes[:]
+ gizmos_includes.append(GIZMOINC)
+
+
+ # make sure local copy of contrib files are up to date
+ if IN_CVS_TREE:
+ contrib_copy_tree(opj(CTRB_INC, 'gizmos'), opj(GIZMOINC, 'wx/gizmos'))
+ contrib_copy_tree(opj(CTRB_SRC, 'gizmos'), GIZMOLOC)
+
+ ext = Extension('gizmosc', [
+ '%s/dynamicsash.cpp' % GIZMOLOC,
+ '%s/editlbox.cpp' % GIZMOLOC,
+ #'%s/multicell.cpp' % GIZMOLOC,
+ '%s/splittree.cpp' % GIZMOLOC,
+ '%s/ledctrl.cpp' % GIZMOLOC,
+ ] + swig_sources,
+
+ include_dirs = gizmos_includes,
+ define_macros = defines,
+
+ library_dirs = libdirs,
+ libraries = libs,
+
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+
+ wxpExtensions.append(ext)
+
+
+
+#----------------------------------------------------------------------
+# Define the DLLWIDGET extension module
+#----------------------------------------------------------------------
+
+if not GL_ONLY and BUILD_DLLWIDGET:
+ msg('Preparing DLLWIDGET...')
+ location = 'contrib/dllwidget'
+ swig_files = ['dllwidget_.i']
+
+ swig_sources = run_swig(swig_files, location, '', PKGDIR,
+ USE_SWIG, swig_force, swig_args)
+
+ # copy a contrib project specific py module to the main package dir
+ copy_file(opj(location, 'dllwidget.py'), PKGDIR, update=1, verbose=0)
+
+ ext = Extension('dllwidget_c', [
+ '%s/dllwidget.cpp' % location,
+ ] + swig_sources,
+
+ include_dirs = includes,
+ define_macros = defines,
+
+ library_dirs = libdirs,
+ libraries = libs,
+
+ extra_compile_args = cflags,
+ extra_link_args = lflags,
+ )
+
+ wxpExtensions.append(ext)
+
+
+
#----------------------------------------------------------------------
# Do the Setup/Build/Install/Whatever