Change the name of 'lib.py' to 'mslib.py'.

6 files changed, 17 insertions, 7 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a97caaa..9156d58 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -73,6 +73,8 @@ RELEASE 0.09 -
   - Prevent SCons from unlinking files in certain situations when
     the -n option is used.
 
+  - Change the name of Tool/lib.py to Tool/mslib.py.
+
  From Steven Knight and Anthony Roach:
 
   - Man page:  document the fact that Builder calls return Node objects.
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index d35168c..17b75d3 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -36,6 +36,14 @@ RELEASE 0.09 - XXX
       formally succeeded despite the absence of a scanned file will now
       fail unless the -k (keep going on error) flag is used.
 
+    - The specification of the name for the 'lib' tool (the Microsoft
+      library archiver) has now been changed to 'mslib'.  If you
+      previously used the Tool() method to fetch the 'lib' tool
+      explicitly, you will need to change the name in the call to
+      'mslib':
+
+          env = Environment(tools = [ Tool('mslib') ])
+
   Please note the following important changes since release 0.07:
 
     - Builder objects no longer automatically split target and source
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()