diff options
author | Steven Knight <knight@baldmt.com> | 2003-01-09 05:29:53 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2003-01-09 05:29:53 (GMT) |
commit | 270b93aea9b0543094f95bdb22c914e1189c31d1 (patch) | |
tree | 37cd2c8844687f1dc33839a3e7f3e7b923fc0ff1 /src/engine | |
parent | 61a74e9d5770e83b296356700c128bd3dd59601e (diff) | |
download | SCons-270b93aea9b0543094f95bdb22c914e1189c31d1.zip SCons-270b93aea9b0543094f95bdb22c914e1189c31d1.tar.gz SCons-270b93aea9b0543094f95bdb22c914e1189c31d1.tar.bz2 |
Add MinGW support. (Anthony Roach)
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/MANIFEST.in | 1 | ||||
-rw-r--r-- | src/engine/SCons/Environment.py | 58 | ||||
-rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 44 | ||||
-rw-r--r-- | src/engine/SCons/Tool/__init__.py | 34 | ||||
-rw-r--r-- | src/engine/SCons/Tool/mingw.py | 131 | ||||
-rw-r--r-- | src/engine/SCons/Tool/mslink.py | 55 |
6 files changed, 276 insertions, 47 deletions
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 3481a24..cf27274 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -45,6 +45,7 @@ SCons/Tool/ilink.py SCons/Tool/latex.py SCons/Tool/lex.py SCons/Tool/masm.py +SCons/Tool/mingw.py SCons/Tool/mslib.py SCons/Tool/mslink.py SCons/Tool/msvc.py diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index a5672ae..5ebf64c 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -421,6 +421,16 @@ class Environment: def Detect(self, progs): """Return the first available program in progs. """ + if not SCons.Util.is_List(progs): + progs = [ progs ] + for prog in progs: + path = self.WhereIs(prog) + if path: return prog + return None + + def WhereIs(self, prog): + """Find prog in the path. + """ path = None pathext = None if self.has_key('ENV'): @@ -428,11 +438,8 @@ class Environment: path = self['ENV']['PATH'] if self['ENV'].has_key('PATHEXT'): pathext = self['ENV']['PATHEXT'] - if not SCons.Util.is_List(progs): - progs = [ progs ] - for prog in progs: - path = SCons.Util.WhereIs(prog, path, pathext) - if path: return prog + path = SCons.Util.WhereIs(prog, path, pathext) + if path: return path return None def Override(self, overrides): @@ -464,4 +471,45 @@ class Environment: def items(self): "Emulates the items() method of dictionaries.""" return self._dict.items() + + def FindIxes(self, paths, prefix, suffix): + """ + Search a list of paths for something that matches the prefix and suffix. + + paths - the list of paths or nodes. + prefix - construction variable for the prefix. + suffix - construction variable for the suffix. + """ + + suffix = self.subst('$%s'%suffix) + prefix = self.subst('$%s'%prefix) + + for path in paths: + dir,name = os.path.split(str(path)) + if name[:len(prefix)] == prefix and name[-len(suffix):] == suffix: + return path + + def ReplaceIxes(self, path, old_prefix, old_suffix, new_prefix, new_suffix): + """ + Replace old_prefix with new_prefix and old_suffix with new_suffix. + + env - Environment used to interpolate variables. + path - the path that will be modified. + old_prefix - construction variable for the old prefix. + old_suffix - construction variable for the old suffix. + new_prefix - construction variable for the new prefix. + new_suffix - construction variable for the new suffix. + """ + old_prefix = self.subst('$%s'%old_prefix) + old_suffix = self.subst('$%s'%old_suffix) + + new_prefix = self.subst('$%s'%new_prefix) + new_suffix = self.subst('$%s'%new_suffix) + + dir,name = os.path.split(str(path)) + if name[:len(old_prefix)] == old_prefix: + name = name[len(old_prefix):] + if name[-len(old_suffix):] == old_suffix: + name = name[:-len(old_suffix)] + return os.path.join(dir, new_prefix+name+new_suffix) diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 0ec3b4e..46aad46 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -696,6 +696,50 @@ class EnvironmentTestCase(unittest.TestCase): x = env.get('bbb', 'XXX') assert x == 'XXX', x + def test_FindIxes(self): + "Test FindIxes()" + env = Environment(LIBPREFIX='lib', + LIBSUFFIX='.a', + SHLIBPREFIX='lib', + SHLIBSUFFIX='.so', + PREFIX='pre', + SUFFIX='post') + + paths = [os.path.join('dir', 'libfoo.a'), + os.path.join('dir', 'libfoo.so')] + + assert paths[0] == env.FindIxes(paths, 'LIBPREFIX', 'LIBSUFFIX') + assert paths[1] == env.FindIxes(paths, 'SHLIBPREFIX', 'SHLIBSUFFIX') + assert None == env.FindIxes(paths, 'PREFIX', 'POST') + + paths = ['libfoo.a', 'prefoopost'] + + assert paths[0] == env.FindIxes(paths, 'LIBPREFIX', 'LIBSUFFIX') + assert None == env.FindIxes(paths, 'SHLIBPREFIX', 'SHLIBSUFFIX') + assert paths[1] == env.FindIxes(paths, 'PREFIX', 'SUFFIX') + + def test_ReplaceIxes(self): + "Test ReplaceIxes()" + env = Environment(LIBPREFIX='lib', + LIBSUFFIX='.a', + SHLIBPREFIX='lib', + SHLIBSUFFIX='.so', + PREFIX='pre', + SUFFIX='post') + + assert 'libfoo.a' == env.ReplaceIxes('libfoo.so', + 'SHLIBPREFIX', 'SHLIBSUFFIX', + 'LIBPREFIX', 'LIBSUFFIX') + + assert os.path.join('dir', 'libfoo.a') == env.ReplaceIxes(os.path.join('dir', 'libfoo.so'), + 'SHLIBPREFIX', 'SHLIBSUFFIX', + 'LIBPREFIX', 'LIBSUFFIX') + + assert 'libfoo.a' == env.ReplaceIxes('prefoopost', + 'PREFIX', 'SUFFIX', + 'LIBPREFIX', 'LIBSUFFIX') + + if __name__ == "__main__": suite = unittest.makeSuite(EnvironmentTestCase, 'test_') if not unittest.TextTestRunner().run(suite).wasSuccessful(): diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 10b6608..f5cea7e 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -140,10 +140,14 @@ def FindAllTools(tools, env): return filter (ToolExists, tools) def tool_list(platform, env): + + # XXX this logic about what tool to prefer on which platform + # should be moved into either the platform files or + # the tool files themselves. if str(platform) == 'win32': "prefer Microsoft tools on Windows" linkers = ['mslink', 'gnulink', 'ilink'] - c_compilers = ['msvc', 'gcc', 'icc'] + c_compilers = ['msvc', 'mingw', 'gcc', 'icc'] assemblers = ['masm', 'nasm', 'gas'] fortran_compilers = ['g77', 'ifl'] ars = ['mslib', 'ar'] @@ -162,17 +166,29 @@ def tool_list(platform, env): fortran_compilers = ['g77', 'ifl'] ars = ['ar', 'mslib'] - linker = FindTool(linkers, env) or linkers[0] c_compiler = FindTool(c_compilers, env) or c_compilers[0] - assembler = FindTool(assemblers, env) or assemblers[0] - fortran_compiler = FindTool(fortran_compilers, env) or fortran_compilers[0] - ar = FindTool(ars, env) or ars[0] - - # Don't use g++ if the C compiler has built-in C++ support: - if c_compiler and (c_compiler == 'msvc' or c_compiler == 'icc'): + + # XXX this logic about what tool provides what should somehow be + # moved into the tool files themselves. + if c_compiler and c_compiler == 'mingw': + # MinGW contains a linker, C compiler, C++ compiler, + # Fortran compiler, archiver and assember: + linker = None + assembler = None + fortran_compiler = None + ar = None cxx_compiler = None else: - cxx_compiler = FindTool(['g++'], env) + linker = FindTool(linkers, env) or linkers[0] + assembler = FindTool(assemblers, env) or assemblers[0] + fortran_compiler = FindTool(fortran_compilers, env) or fortran_compilers[0] + ar = FindTool(ars, env) or ars[0] + + # Don't use g++ if the C compiler has built-in C++ support: + if c_compiler and (c_compiler == 'msvc' or c_compiler == 'icc'): + cxx_compiler = None + else: + cxx_compiler = FindTool(['g++'], env) other_tools = FindAllTools(['dvipdf', 'dvips', 'latex', 'lex', diff --git a/src/engine/SCons/Tool/mingw.py b/src/engine/SCons/Tool/mingw.py new file mode 100644 index 0000000..7221cd6 --- /dev/null +++ b/src/engine/SCons/Tool/mingw.py @@ -0,0 +1,131 @@ +"""SCons.Tool.gcc + +Tool-specific initialization for MinGW (http://www.mingw.org/) + +There normally shouldn't be any need to import this module directly. +It will usually be imported through the generic SCons.Tool.Tool() +selection method. + +""" + +# +# Copyright (c) 2001, 2002 Steven Knight +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os.path +import os +import SCons.Tool +import SCons.Util +import string + +# This is what we search for to find mingw: +key_program = 'mingw32-gcc' + +def find(env): + # First search in the SCons path and then the OS path: + return env.WhereIs(key_program) or SCons.Util.WhereIs(key_program) + +def shlib_generator(target, source, env, for_signature): + cmd = ['$SHLINK', '$SHLINKFLAGS'] + + dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') + if dll: cmd.extend(['-o', dll]) + + cmd.extend(['$SOURCES', '$_LIBDIRFLAGS', '$_LIBFLAGS']) + + implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX') + if implib: cmd.append('-Wl,--out-implib,'+str(implib)) + + return [cmd] + +def shlib_emitter(target, source, env): + dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') + no_import_lib = env.get('no_import_lib', 0) + + if not dll: + raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX") + + if not no_import_lib and \ + not env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX'): + + # Append an import library to the list of targets. + target.append(env.ReplaceIxes(dll, + 'SHLIBPREFIX', 'SHLIBSUFFIX', + 'LIBPREFIX', 'LIBSUFFIX')) + + return (target, source) + + +shlib_action = SCons.Action.CommandGenerator(shlib_generator) + +res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.o') + +def generate(env, platform): + + mingw = find(env) + if mingw: + dir = os.path.dirname(mingw) + + # The mingw bin directory must be added to the path: + path = env['ENV'].get('PATH', []) + if not path: + path = [] + if SCons.Util.is_String(path): + path = string.split(path, os.pathsep) + + env['ENV']['PATH'] = string.join([dir] + path, os.pathsep) + + + # Most of mingw is the same as gcc and friends... + gnu_tools = ['gcc', 'g++', 'gnulink', 'ar', 'gas'] + for tool in gnu_tools: + SCons.Tool.Tool(tool, platform)(env,platform) + + #... but a few things differ: + env['CC'] = 'gcc' + env['SHCCFLAGS'] = '$CCFLAGS' + env['CXX'] = 'g++' + env['SHCXXFLAGS'] = '$CXXFLAGS' + env['SHLINKFLAGS'] = '$LINKFLAGS -shared' + env['SHLINKCOM'] = shlib_action + env['SHLIBEMITTER']= shlib_emitter + env['LINK'] = 'g++' + env['AS'] = 'as' + + env['RC'] = 'windres' + env['RCFLAGS'] = '' + env['RCINCFLAGS'] = '$( ${_concat(RCINCPREFIX, CPPPATH, RCINCSUFFIX, locals(), globals(), RDirs)} $)' + env['RCINCPREFIX'] = '--include-dir ' + env['RCINCSUFFIX'] = '' + env['RCCOM'] = '$RC $RCINCFLAGS $RCFLAGS -i $SOURCE -o $TARGET' + env.CScan.add_skey('.rc') + env['BUILDERS']['RES'] = res_builder + + # Some setting from the platform also have to be overridden: + env['OBJSUFFIX'] = '.o' + env['LIBPREFIX'] = 'lib' + env['LIBSUFFIX'] = '.a' + +def exists(env): + return find(env) diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index 133e700..5b073b1 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -57,27 +57,24 @@ def win32LinkGenerator(env, target, source, for_signature): def win32LibGenerator(target, source, env, for_signature): listCmd = [ "$SHLINK", "$SHLINKFLAGS" ] - no_import_lib = env.get('no_import_lib', 0) if env.has_key('PDB') and env['PDB']: listCmd.extend(['/PDB:%s'%target[0].File(env['PDB']), '/DEBUG']) - for tgt in target: - ext = os.path.splitext(str(tgt))[1] - if ext == env.subst("$LIBSUFFIX"): - # Put it on the command line as an import library. - if no_import_lib: - raise SCons.Errors.UserError, "%s: You cannot specify a .lib file as a target of a shared library build if no_import_library is nonzero." % tgt - listCmd.append("${WIN32IMPLIBPREFIX}%s" % tgt) - else: - listCmd.append("${WIN32DLLPREFIX}%s" % tgt) + dll = env.FindIxes(target, 'SHLIBPREFIX', 'SHLIBSUFFIX') + if dll: listCmd.append("/out:%s"%dll) + implib = env.FindIxes(target, 'LIBPREFIX', 'LIBSUFFIX') + if implib: listCmd.append("/implib:%s"%implib) + listCmd.extend([ '$_LIBDIRFLAGS', '$_LIBFLAGS' ]) + + deffile = env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX") + for src in source: - ext = os.path.splitext(str(src))[1] - if ext == env.subst("$WIN32DEFSUFFIX"): + if src == deffile: # Treat this source as a .def file. - listCmd.append("${WIN32DEFPREFIX}%s" % src) + listCmd.append("/def:%s" % src) else: # Just treat it as a generic source file. listCmd.append(str(src)) @@ -87,37 +84,31 @@ def win32LibGenerator(target, source, env, for_signature): def win32LibEmitter(target, source, env): msvc.validate_vars(env) - dll = None + dll = env.FindIxes(target, "SHLIBPREFIX", "SHLIBSUFFIX") no_import_lib = env.get('no_import_lib', 0) - for tgt in target: - ext = os.path.splitext(str(tgt))[1] - if ext == env.subst("$SHLIBSUFFIX"): - dll = tgt - break if not dll: raise SCons.Errors.UserError, "A shared library should have exactly one target with the suffix: %s" % env.subst("$SHLIBSUFFIX") - if env.has_key("WIN32_INSERT_DEF") and \ - env["WIN32_INSERT_DEF"] and \ - not '.def' in map(lambda x: os.path.splitext(str(x))[1], - source): + if env.get("WIN32_INSERT_DEF", 0) and \ + not env.FindIxes(source, "WIN32DEFPREFIX", "WIN32DEFSUFFIX"): # append a def file to the list of sources - source.append("%s%s" % (os.path.splitext(str(dll))[0], - env.subst("$WIN32DEFSUFFIX"))) + source.append(env.ReplaceIxes(dll, + "SHLIBPREFIX", "SHLIBSUFFIX", + "WIN32DEFPREFIX", "WIN32DEFSUFFIX")) if env.has_key('PDB') and env['PDB']: env.SideEffect(env['PDB'], target) env.Precious(env['PDB']) if not no_import_lib and \ - not env.subst("$LIBSUFFIX") in \ - map(lambda x: os.path.splitext(str(x))[1], target): + not env.FindIxes(target, "LIBPREFIX", "LIBSUFFIX"): # Append an import library to the list of targets. - target.append("%s%s%s" % (env.subst("$LIBPREFIX"), - os.path.splitext(str(dll))[0], - env.subst("$LIBSUFFIX"))) + target.append(env.ReplaceIxes(dll, + "SHLIBPREFIX", "SHLIBSUFFIX", + "LIBPREFIX", "LIBSUFFIX")) + return (target, source) def prog_emitter(target, source, env): @@ -150,10 +141,8 @@ def generate(env, platform): env['LIBLINKPREFIX']='' env['LIBLINKSUFFIX']='$LIBSUFFIX' - env['WIN32DEFPREFIX'] = '/def:' + env['WIN32DEFPREFIX'] = '' env['WIN32DEFSUFFIX'] = '.def' - env['WIN32DLLPREFIX'] = '/out:' - env['WIN32IMPLIBPREFIX'] = '/implib:' env['WIN32_INSERT_DEF'] = 0 include_path, lib_path, exe_path = get_msdev_paths() |