X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d28516c7c41c8c1ab54b89acfc5fb77e40f36905..1d21855083920c136002fbd9a283def320cd1c53:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index a50801ba1f..ed41eb4ba1 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.2b4" +VERSION = "2.3.2b7" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " @@ -33,6 +33,7 @@ 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 CORE_ONLY = 0 # if true, don't build any of the above @@ -64,7 +65,7 @@ HYBRID = 0 # 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 = '23_2' # Version part of DLL name +WXDLLVER = '232' # Version part of DLL name #---------------------------------------------------------------------- @@ -77,6 +78,15 @@ def opj(*args): 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 #---------------------------------------------------------------------- @@ -148,6 +158,7 @@ if os.name == 'nt': FINAL = 0 includes = ['src', + opj(WXDIR, 'lib', 'mswdll' + libFlag()), opj(WXDIR, 'include'), ] @@ -188,16 +199,9 @@ if os.name == 'nt': 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] @@ -212,7 +216,7 @@ if os.name == 'nt': 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') @@ -229,6 +233,29 @@ if os.name == 'nt': +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 @@ -244,7 +271,7 @@ elif os.name == 'posix': 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) @@ -274,7 +301,8 @@ swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii', #'-docstring', '-Sbefore', - '-I./src', '-D'+WXPLAT] + '-I./src', '-D'+WXPLAT, + ] swig_deps = ['src/my_typemaps.i'] @@ -415,14 +443,13 @@ if BUILD_GLCANVAS or GL_ONLY: gl_libs = [] if os.name == 'posix': - if '-D__WXDEBUG__' in cflags: - gl_libs = ['wx_gtkd_gl', 'GL', 'GLU'] - else: - gl_libs = ['wx_gtk_gl', 'GL', 'GLU'] + gl_config = os.popen(WX_CONFIG + ' --gl-libs', 'r').read()[:-1] + gl_lflags = string.split(gl_config) + lflags + gl_libs = libs else: other_sources = [opj(location, 'msw/myglcanvas.cpp')] - gl_libs = ['opengl32', 'glu32'] - + gl_libs = libs + ['opengl32', 'glu32'] + gl_lflags = lflags ext = Extension('glcanvasc', swig_sources + other_sources, @@ -431,10 +458,10 @@ if BUILD_GLCANVAS or GL_ONLY: define_macros = defines, library_dirs = libdirs, - libraries = libs + gl_libs, + libraries = gl_libs, extra_compile_args = cflags, - extra_link_args = lflags, + extra_link_args = gl_lflags, ) wxpExtensions.append(ext) @@ -521,7 +548,7 @@ if not GL_ONLY and BUILD_STC: 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')]) @@ -557,14 +584,16 @@ if not GL_ONLY and BUILD_STC: '%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, @@ -718,6 +747,51 @@ if not GL_ONLY and BUILD_XRC: +#---------------------------------------------------------------------- +# 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, + ] + 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) + + + #---------------------------------------------------------------------- # Do the Setup/Build/Install/Whatever