From 55c020cf641a1e9db2e21a89aa62f85f4f23bc87 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 1 Sep 2001 02:35:31 +0000 Subject: [PATCH] Cleaned up some and started using path joins and normalization instead of string concatenation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/setup.py | 82 +++++++++++++++++++++++++++++++---------------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/wxPython/setup.py b/wxPython/setup.py index 89c479f506..ee2b3d47f9 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -73,6 +73,9 @@ def msg(text): if __name__ == "__main__": print text +def opj(*args): + path = apply(os.path.join, args) + return os.path.normpath(path) #---------------------------------------------------------------------- # Some other globals @@ -145,7 +148,7 @@ if os.name == 'nt': FINAL = 0 includes = ['src', - os.path.join(WXDIR, 'include'), + opj(WXDIR, 'include'), ] defines = [ ('WIN32', None), # Some of these are no longer @@ -184,7 +187,7 @@ if os.name == 'nt': if not FINAL or HYBRID: defines.append( ('__WXDEBUG__', None) ) - libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib'] + libdirs = [opj(WXDIR, 'lib'), 'build\\ilib'] if FINAL: wxdll = 'wx' + WXDLLVER @@ -211,8 +214,8 @@ if os.name == 'nt': if bcpp_compiling: # overwrite it cflags = ['-5', '-VF', ### To supplort MSVC spurious semicolons in the class scope ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated - '-Hc', '-H='+WXDIR+'\src\msw\wx32.csm', - '@'+WXDIR+'\src\msw\wxwin32.cfg' + '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'), + '@' + opj(WXDIR, '\src\msw\wxwin32.cfg') ] @@ -299,7 +302,7 @@ if not GL_ONLY: if IN_CVS_TREE: # update the licence files mkpath('licence') for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']: - copy_file(WXDIR+'/docs/'+file, 'licence/'+file, update=1, verbose=0) + copy_file(opj(WXDIR, 'docs', file), opj('licence',file), update=1, verbose=0) if os.name == 'nt': @@ -398,6 +401,9 @@ if not GL_ONLY: # Define the GLCanvas extension module #---------------------------------------------------------------------- +CTRB_SRC = opj(WXDIR, 'contrib/src') +CTRB_INC = opj(WXDIR, 'contrib/include/wx') + if BUILD_GLCANVAS or GL_ONLY: msg('Preparing GLCANVAS...') location = 'contrib/glcanvas' @@ -414,7 +420,7 @@ if BUILD_GLCANVAS or GL_ONLY: else: gl_libs = ['wx_gtk_gl', 'GL', 'GLU'] else: - other_sources = [location + '/msw/myglcanvas.cpp'] + other_sources = [opj(location, 'msw/myglcanvas.cpp')] gl_libs = ['opengl32', 'glu32'] @@ -441,8 +447,8 @@ if BUILD_GLCANVAS or GL_ONLY: if not GL_ONLY and BUILD_OGL: msg('Preparing OGL...') location = 'contrib/ogl' - OGLLOC = location + '/contrib/src/ogl' - OGLINC = location + '/contrib/include' + OGLLOC = opj(location, 'contrib/src/ogl') + OGLINC = opj(location, 'contrib/include') swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', 'oglcanvas.i'] @@ -450,10 +456,10 @@ if not GL_ONLY and BUILD_OGL: swig_sources = run_swig(swig_files, location, '', PKGDIR, USE_SWIG, swig_force, swig_args) - # make sure local copy of contrib files are up to date if IN_CVS_TREE: - contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl') - contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC) + # make sure local copy of contrib files are up to date + contrib_copy_tree(opj(CTRB_INC, 'ogl'), opj(OGLINC, 'wx/ogl')) + contrib_copy_tree(opj(CTRB_SRC, 'ogl'), OGLLOC) ext = Extension('oglc', ['%s/basic.cpp' % OGLLOC, '%s/bmpshape.cpp' % OGLLOC, @@ -490,24 +496,38 @@ if not GL_ONLY and BUILD_OGL: if not GL_ONLY and BUILD_STC: msg('Preparing STC...') location = 'contrib/stc' - STCLOC = location + '/contrib/src/stc' - STCINC = location + '/contrib/include' - STC_H = location + '/contrib/include/wx/stc' + STCLOC = opj(location, 'contrib/src/stc') + STCINC = opj(location, 'contrib/include') + STC_H = opj(location, 'contrib/include/wx/stc') - # make sure local copy of contrib files are up to date if IN_CVS_TREE: - contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc') - contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC) + # Check if gen_iface needs to be run for the wxSTC sources + if (newer(opj(CTRB_SRC, 'stc/stc.h.in'), opj(CTRB_INC, 'stc/stc.h' )) or + newer(opj(CTRB_SRC, 'stc/stc.cpp.in'), opj(CTRB_SRC, 'stc/stc.cpp')) or + newer(opj(CTRB_SRC, 'stc/gen_iface.py'), opj(CTRB_SRC, 'stc/stc.cpp'))): + + msg('Running gen_iface.py, regenerating stc.h and stc.cpp...') + cwd = os.getcwd() + os.chdir(opj(CTRB_SRC, 'stc')) + import gen_iface + gen_iface.main([]) + os.chdir(cwd) + + + # make sure local copy of contrib files are up to date + contrib_copy_tree(opj(CTRB_INC, 'stc'), opj(STCINC, 'wx/stc')) + contrib_copy_tree(opj(CTRB_SRC, 'stc'), STCLOC) + swig_files = ['stc_.i'] swig_sources = run_swig(swig_files, location, '', PKGDIR, USE_SWIG, swig_force, swig_args + ['-I'+STC_H, '-I'+location], - [STC_H+'/stc.h']) + [opj(STC_H, 'stc.h')]) # copy a project specific py module to the main package dir - copy_file(location+'/stc.py', PKGDIR, update=1, verbose=0) + copy_file(opj(location, 'stc.py'), PKGDIR, update=1, verbose=0) # add some include dirs to the standard set stc_includes = includes[:] @@ -527,27 +547,35 @@ if not GL_ONLY and BUILD_STC: '%s/scintilla/src/CellBuffer.cxx' % STCLOC, '%s/scintilla/src/ContractionState.cxx' % STCLOC, '%s/scintilla/src/Document.cxx' % STCLOC, + '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC, '%s/scintilla/src/Editor.cxx' % STCLOC, '%s/scintilla/src/Indicator.cxx' % STCLOC, '%s/scintilla/src/KeyMap.cxx' % STCLOC, '%s/scintilla/src/KeyWords.cxx' % STCLOC, '%s/scintilla/src/LineMarker.cxx' % STCLOC, '%s/scintilla/src/PropSet.cxx' % STCLOC, + '%s/scintilla/src/RESearch.cxx' % STCLOC, '%s/scintilla/src/ScintillaBase.cxx' % STCLOC, '%s/scintilla/src/Style.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/LexEiffel.cxx' % STCLOC, '%s/scintilla/src/LexHTML.cxx' % STCLOC, + '%s/scintilla/src/LexLisp.cxx' % STCLOC, '%s/scintilla/src/LexLua.cxx' % STCLOC, '%s/scintilla/src/LexOthers.cxx' % STCLOC, + '%s/scintilla/src/LexPascal.cxx' % STCLOC, '%s/scintilla/src/LexPerl.cxx' % STCLOC, '%s/scintilla/src/LexPython.cxx' % STCLOC, + '%s/scintilla/src/LexRuby.cxx' % STCLOC, '%s/scintilla/src/LexSQL.cxx' % STCLOC, '%s/scintilla/src/LexVB.cxx' % STCLOC, - '%s/scintilla/src/DocumentAccessor.cxx' % STCLOC, - '%s/scintilla/src/UniConversion.cxx' % STCLOC, - '%s/scintilla/src/WindowAccessor.cxx' % STCLOC, - '%s/scintilla/src/PosRegExp.cxx' % STCLOC, '%s/PlatWX.cpp' % STCLOC, '%s/ScintillaWX.cpp' % STCLOC, @@ -605,8 +633,8 @@ if not GL_ONLY and BUILD_IEWIN: if not GL_ONLY and BUILD_XRC: msg('Preparing XRC...') location = 'contrib/xrc' - XMLLOC = location + '/contrib/src/xrc' - XMLINC = location + '/contrib/include' + XMLLOC = opj(location, 'contrib/src/xrc') + XMLINC = opj(location, 'contrib/include') swig_files = ['xrc.i'] @@ -621,8 +649,8 @@ if not GL_ONLY and BUILD_XRC: # make sure local copy of contrib files are up to date if IN_CVS_TREE: - contrib_copy_tree(WXDIR + '/contrib/include/wx/xrc', XMLINC+'/wx/xrc') - contrib_copy_tree(WXDIR + '/contrib/src/xrc', XMLLOC) + contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc')) + contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC) ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC, '%s/expat/xmltok/xmlrole.c' % XMLLOC, -- 2.45.2