diff options
| author | Steven Knight <knight@baldmt.com> | 2002-12-05 10:41:31 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-12-05 10:41:31 (GMT) |
| commit | 1989e2672394227e183691f93c012881ab371179 (patch) | |
| tree | dc8454b267cae4a60eae7b55899f21e18ec8b329 /src/engine | |
| parent | 2e49581b613cd875ae114ba137e28512693605d8 (diff) | |
| download | SCons-1989e2672394227e183691f93c012881ab371179.zip SCons-1989e2672394227e183691f93c012881ab371179.tar.gz SCons-1989e2672394227e183691f93c012881ab371179.tar.bz2 | |
Change the name of 'lib.py' to 'mslib.py'.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/MANIFEST.in | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mslib.py (renamed from src/engine/SCons/Tool/lib.py) | 2 | ||||
| -rw-r--r-- | src/engine/SCons/UtilTests.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index d500733..3481a24 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -44,8 +44,8 @@ SCons/Tool/ifl.py SCons/Tool/ilink.py SCons/Tool/latex.py SCons/Tool/lex.py -SCons/Tool/lib.py SCons/Tool/masm.py +SCons/Tool/mslib.py SCons/Tool/mslink.py SCons/Tool/msvc.py SCons/Tool/nasm.py diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py index 661ea96..10b6608 100644 --- a/src/engine/SCons/Tool/__init__.py +++ b/src/engine/SCons/Tool/__init__.py @@ -146,21 +146,21 @@ def tool_list(platform, env): c_compilers = ['msvc', 'gcc', 'icc'] assemblers = ['masm', 'nasm', 'gas'] fortran_compilers = ['g77', 'ifl'] - ars = ['lib', 'ar'] + ars = ['mslib', 'ar'] elif str(platform) == 'os2': "prefer IBM tools on OS/2" linkers = ['ilink', 'gnulink', 'mslink'] c_compilers = ['icc', 'gcc', 'msvc'] assemblers = ['nasm', 'masm', 'gas'] fortran_compilers = ['ifl', 'g77'] - ars = ['ar', 'lib'] + ars = ['ar', 'mslib'] else: "prefer GNU tools on all other platforms" linkers = ['gnulink', 'mslink', 'ilink'] c_compilers = ['gcc', 'msvc', 'icc'] assemblers = ['gas', 'nasm', 'masm'] fortran_compilers = ['g77', 'ifl'] - ars = ['ar', 'lib'] + ars = ['ar', 'mslib'] linker = FindTool(linkers, env) or linkers[0] c_compiler = FindTool(c_compilers, env) or c_compilers[0] diff --git a/src/engine/SCons/Tool/lib.py b/src/engine/SCons/Tool/mslib.py index ed93bb9..f89e669 100644 --- a/src/engine/SCons/Tool/lib.py +++ b/src/engine/SCons/Tool/mslib.py @@ -1,4 +1,4 @@ -"""SCons.Tool.lib +"""SCons.Tool.mslib Tool-specific initialization for lib (MicroSoft library archiver). diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py index 4b93d0f..1f609ab 100644 --- a/src/engine/SCons/UtilTests.py +++ b/src/engine/SCons/UtilTests.py @@ -489,8 +489,8 @@ class UtilTestCase(unittest.TestCase): res = mapPaths([ file, 'baz', 'blat/boo', '#test' ], dir) assert res[0] == file, res[0] - assert res[1] == os.path.normpath('foo/baz'), res[1] - assert res[2] == os.path.normpath('foo/blat/boo'), res[2] + assert res[1] == os.path.join('foo', 'baz'), res[1] + assert res[2] == os.path.join('foo', 'blat/boo'), res[2] assert res[3] == '#test', res[3] env=DummyEnv() |