Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up some and started using path joins and normalization instead

Browse Source 
of string concatenation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-09-01 02:35:31 +00:00
parent 11358d3976
commit 55c020cf64
1 changed files with 55 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
wxPython/setup.py
View File

@@ -73,6 +73,9 @@ def msg(text):
if __name__ == "__main__": if __name__ == "__main__":
print text print text
def opj(*args):
path = apply(os.path.join, args)
return os.path.normpath(path)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Some other globals # Some other globals
@@ -145,7 +148,7 @@ if os.name == 'nt':
FINAL = 0 FINAL = 0
includes = ['src', includes = ['src',
os.path.join(WXDIR, 'include'), opj(WXDIR, 'include'),
] ]
defines = [ ('WIN32', None), # Some of these are no longer defines = [ ('WIN32', None), # Some of these are no longer
@@ -184,7 +187,7 @@ if os.name == 'nt':
if not FINAL or HYBRID: if not FINAL or HYBRID:
defines.append( ('__WXDEBUG__', None) ) defines.append( ('__WXDEBUG__', None) )
libdirs = [os.path.join(WXDIR, 'lib'), 'build\\ilib'] libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
if FINAL: if FINAL:
wxdll = 'wx' + WXDLLVER wxdll = 'wx' + WXDLLVER
@@ -211,8 +214,8 @@ if os.name == 'nt':
if bcpp_compiling: # overwrite it if bcpp_compiling: # overwrite it
cflags = ['-5', '-VF', ### To supplort MSVC spurious semicolons in the class scope 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 ### else, all semicolons at the end of all DECLARE_...CALLBACK... macros must be eliminated
'-Hc', '-H='+WXDIR+'\src\msw\wx32.csm', '-Hc', '-H=' + opj(WXDIR, '\src\msw\wx32.csm'),
'@'+WXDIR+'\src\msw\wxwin32.cfg' '@' + opj(WXDIR, '\src\msw\wxwin32.cfg')
] ]
@@ -299,7 +302,7 @@ if not GL_ONLY:
if IN_CVS_TREE: # update the licence files if IN_CVS_TREE: # update the licence files
mkpath('licence') mkpath('licence')
for file in ['preamble.txt', 'licence.txt', 'licendoc.txt', 'lgpl.txt']: 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': if os.name == 'nt':
@@ -398,6 +401,9 @@ if not GL_ONLY:
# Define the GLCanvas extension module # Define the GLCanvas extension module
#---------------------------------------------------------------------- #----------------------------------------------------------------------
CTRB_SRC = opj(WXDIR, 'contrib/src')
CTRB_INC = opj(WXDIR, 'contrib/include/wx')
if BUILD_GLCANVAS or GL_ONLY: if BUILD_GLCANVAS or GL_ONLY:
msg('Preparing GLCANVAS...') msg('Preparing GLCANVAS...')
location = 'contrib/glcanvas' location = 'contrib/glcanvas'
@@ -414,7 +420,7 @@ if BUILD_GLCANVAS or GL_ONLY:
else: else:
gl_libs = ['wx_gtk_gl', 'GL', 'GLU'] gl_libs = ['wx_gtk_gl', 'GL', 'GLU']
else: else:
other_sources = [location + '/msw/myglcanvas.cpp'] other_sources = [opj(location, 'msw/myglcanvas.cpp')]
gl_libs = ['opengl32', 'glu32'] gl_libs = ['opengl32', 'glu32']
@@ -441,8 +447,8 @@ if BUILD_GLCANVAS or GL_ONLY:
if not GL_ONLY and BUILD_OGL: if not GL_ONLY and BUILD_OGL:
msg('Preparing OGL...') msg('Preparing OGL...')
location = 'contrib/ogl' location = 'contrib/ogl'
OGLLOC = location + '/contrib/src/ogl' OGLLOC = opj(location, 'contrib/src/ogl')
OGLINC = location + '/contrib/include' OGLINC = opj(location, 'contrib/include')
swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', swig_files = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i',
'oglcanvas.i'] 'oglcanvas.i']
@@ -450,10 +456,10 @@ if not GL_ONLY and BUILD_OGL:
swig_sources = run_swig(swig_files, location, '', PKGDIR, swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, swig_args) USE_SWIG, swig_force, swig_args)
# make sure local copy of contrib files are up to date
if IN_CVS_TREE: if IN_CVS_TREE:
contrib_copy_tree(WXDIR + '/contrib/include/wx/ogl', OGLINC+'/wx/ogl') # make sure local copy of contrib files are up to date
contrib_copy_tree(WXDIR + '/contrib/src/ogl', OGLLOC) 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, ext = Extension('oglc', ['%s/basic.cpp' % OGLLOC,
'%s/bmpshape.cpp' % OGLLOC, '%s/bmpshape.cpp' % OGLLOC,
@@ -490,24 +496,38 @@ if not GL_ONLY and BUILD_OGL:
if not GL_ONLY and BUILD_STC: if not GL_ONLY and BUILD_STC:
msg('Preparing STC...') msg('Preparing STC...')
location = 'contrib/stc' location = 'contrib/stc'
STCLOC = location + '/contrib/src/stc' STCLOC = opj(location, 'contrib/src/stc')
STCINC = location + '/contrib/include' STCINC = opj(location, 'contrib/include')
STC_H = location + '/contrib/include/wx/stc' STC_H = opj(location, 'contrib/include/wx/stc')
# make sure local copy of contrib files are up to date
if IN_CVS_TREE: if IN_CVS_TREE:
contrib_copy_tree(WXDIR + '/contrib/include/wx/stc', STCINC+'/wx/stc') # Check if gen_iface needs to be run for the wxSTC sources
contrib_copy_tree(WXDIR + '/contrib/src/stc', STCLOC) 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_files = ['stc_.i']
swig_sources = run_swig(swig_files, location, '', PKGDIR, swig_sources = run_swig(swig_files, location, '', PKGDIR,
USE_SWIG, swig_force, USE_SWIG, swig_force,
swig_args + ['-I'+STC_H, '-I'+location], 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 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 # add some include dirs to the standard set
stc_includes = includes[:] stc_includes = includes[:]
@@ -527,27 +547,35 @@ if not GL_ONLY and BUILD_STC:
'%s/scintilla/src/CellBuffer.cxx' % STCLOC, '%s/scintilla/src/CellBuffer.cxx' % STCLOC,
'%s/scintilla/src/ContractionState.cxx' % STCLOC, '%s/scintilla/src/ContractionState.cxx' % STCLOC,
'%s/scintilla/src/Document.cxx' % STCLOC, '%s/scintilla/src/Document.cxx' % STCLOC,
'%s/scintilla/src/DocumentAccessor.cxx' % STCLOC,
'%s/scintilla/src/Editor.cxx' % STCLOC, '%s/scintilla/src/Editor.cxx' % STCLOC,
'%s/scintilla/src/Indicator.cxx' % STCLOC, '%s/scintilla/src/Indicator.cxx' % STCLOC,
'%s/scintilla/src/KeyMap.cxx' % STCLOC, '%s/scintilla/src/KeyMap.cxx' % STCLOC,
'%s/scintilla/src/KeyWords.cxx' % STCLOC, '%s/scintilla/src/KeyWords.cxx' % STCLOC,
'%s/scintilla/src/LineMarker.cxx' % STCLOC, '%s/scintilla/src/LineMarker.cxx' % STCLOC,
'%s/scintilla/src/PropSet.cxx' % STCLOC, '%s/scintilla/src/PropSet.cxx' % STCLOC,
'%s/scintilla/src/RESearch.cxx' % STCLOC,
'%s/scintilla/src/ScintillaBase.cxx' % STCLOC, '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
'%s/scintilla/src/Style.cxx' % STCLOC, '%s/scintilla/src/Style.cxx' % STCLOC,
'%s/scintilla/src/UniConversion.cxx' % STCLOC,
'%s/scintilla/src/ViewStyle.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/LexCPP.cxx' % STCLOC,
'%s/scintilla/src/LexEiffel.cxx' % STCLOC,
'%s/scintilla/src/LexHTML.cxx' % STCLOC, '%s/scintilla/src/LexHTML.cxx' % STCLOC,
'%s/scintilla/src/LexLisp.cxx' % STCLOC,
'%s/scintilla/src/LexLua.cxx' % STCLOC, '%s/scintilla/src/LexLua.cxx' % STCLOC,
'%s/scintilla/src/LexOthers.cxx' % STCLOC, '%s/scintilla/src/LexOthers.cxx' % STCLOC,
'%s/scintilla/src/LexPascal.cxx' % STCLOC,
'%s/scintilla/src/LexPerl.cxx' % STCLOC, '%s/scintilla/src/LexPerl.cxx' % STCLOC,
'%s/scintilla/src/LexPython.cxx' % STCLOC, '%s/scintilla/src/LexPython.cxx' % STCLOC,
'%s/scintilla/src/LexRuby.cxx' % STCLOC,
'%s/scintilla/src/LexSQL.cxx' % STCLOC, '%s/scintilla/src/LexSQL.cxx' % STCLOC,
'%s/scintilla/src/LexVB.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/PlatWX.cpp' % STCLOC,
'%s/ScintillaWX.cpp' % STCLOC, '%s/ScintillaWX.cpp' % STCLOC,
@@ -605,8 +633,8 @@ if not GL_ONLY and BUILD_IEWIN:
if not GL_ONLY and BUILD_XRC: if not GL_ONLY and BUILD_XRC:
msg('Preparing XRC...') msg('Preparing XRC...')
location = 'contrib/xrc' location = 'contrib/xrc'
XMLLOC = location + '/contrib/src/xrc' XMLLOC = opj(location, 'contrib/src/xrc')
XMLINC = location + '/contrib/include' XMLINC = opj(location, 'contrib/include')
swig_files = ['xrc.i'] 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 # make sure local copy of contrib files are up to date
if IN_CVS_TREE: if IN_CVS_TREE:
contrib_copy_tree(WXDIR + '/contrib/include/wx/xrc', XMLINC+'/wx/xrc') contrib_copy_tree(opj(CTRB_INC, 'xrc'), opj(XMLINC, 'wx/xrc'))
contrib_copy_tree(WXDIR + '/contrib/src/xrc', XMLLOC) contrib_copy_tree(opj(CTRB_SRC, 'xrc'), XMLLOC)
ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC, ext = Extension('xrcc', ['%s/expat/xmlparse/xmlparse.c' % XMLLOC,
'%s/expat/xmltok/xmlrole.c' % XMLLOC, '%s/expat/xmltok/xmlrole.c' % XMLLOC,