Add separate $RANLIBCOM and $RANLIBCOMSTR variables. (Christoph Schulz)

10 files changed, 202 insertions, 14 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 9b0154c..3c3ab20 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -722,6 +722,9 @@ RELEASE 0.97 - XXX
 
   - Add support for a $INSTALLSTR variable.
 
+  - Add support for $RANLIBCOM and $RANLIBCOMSTR variables (which fixes
+    a bug when setting $ARCOMSTR).
+
   From Craig Scott:
 
   - Have the Fortran module emitter look for Fortan modules to be created
diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 528ee4d..77da0c7 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -169,8 +169,12 @@ def createStaticLibBuilder(env):
     try:
         static_lib = env['BUILDERS']['StaticLibrary']
     except KeyError:
-        ar_action = SCons.Action.Action("$ARCOM", "$ARCOMSTR")
-        static_lib = SCons.Builder.Builder(action = ar_action,
+        action_list = [ SCons.Action.Action("$ARCOM", "$ARCOMSTR") ]
+        if env.Detect('ranlib'):
+            ranlib_action = SCons.Action.Action("$RANLIBCOM", "$RANLIBCOMSTR")
+            action_list.append(ranlib_action)
+
+        static_lib = SCons.Builder.Builder(action = action_list,
                                            emitter = '$LIBEMITTER',
                                            prefix = '$LIBPREFIX',
                                            suffix = '$LIBSUFFIX',
diff --git a/src/engine/SCons/Tool/ar.py b/src/engine/SCons/Tool/ar.py
index 92cab59..913da5f 100644
--- a/src/engine/SCons/Tool/ar.py
+++ b/src/engine/SCons/Tool/ar.py
@@ -42,18 +42,16 @@ def generate(env):
     """Add Builders and construction variables for ar to an Environment."""
     SCons.Tool.createStaticLibBuilder(env)
 
-    arcom = '$AR $ARFLAGS $TARGET $SOURCES'
-    ranlib = 'ranlib'
-    if env.Detect(ranlib):
-        arcom = arcom + '\n$RANLIB $RANLIBFLAGS $TARGET'
-
     env['AR']          = 'ar'
-    env['ARFLAGS']     = SCons.Util.CLVar('r')
-    env['RANLIB']      = ranlib
-    env['RANLIBFLAGS'] = SCons.Util.CLVar('')
-    env['ARCOM']       = arcom
+    env['ARFLAGS']     = SCons.Util.CLVar('rc')
+    env['ARCOM']       = '$AR $ARFLAGS $TARGET $SOURCES'
     env['LIBPREFIX']   = 'lib'
     env['LIBSUFFIX']   = '.a'
 
+    if env.Detect('ranlib'):
+        env['RANLIB']      = 'ranlib'
+        env['RANLIBFLAGS'] = SCons.Util.CLVar('')
+        env['RANLIBCOM']   = '$RANLIB $RANLIBFLAGS $TARGET'
+
 def exists(env):
     return env.Detect('ar')
diff --git a/src/engine/SCons/Tool/ar.xml b/src/engine/SCons/Tool/ar.xml
index baebd27..24f886b 100644
--- a/src/engine/SCons/Tool/ar.xml
+++ b/src/engine/SCons/Tool/ar.xml
@@ -46,6 +46,23 @@ The archive indexer.
 </summary>
 </cvar>
 
+<cvar name="RANLIBCOM">
+<summary>
+The command line used to index a static library archive.
+</summary>
+</cvar>
+
+<cvar name="RANLIBCOMSTR">
+<summary>
+The string displayed when a static library archive is indexed.
+If this is not set, then &cv-RANLIBCOM; (the command line) is displayed.
+
+<example>
+env = Environment(RANLIBCOMSTR = "Indexing $TARGET")
+</example>
+</summary>
+</cvar>
+
 <cvar name="RANLIBFLAGS">
 <summary>
 General options passed to the archive indexer.
diff --git a/test/AR/ARCOM.py b/test/AR/ARCOM.py
index cf46559..c8ac1d8 100644
--- a/test/AR/ARCOM.py
+++ b/test/AR/ARCOM.py
@@ -46,13 +46,17 @@ for f in sys.argv[2:]:
 sys.exit(0)
 """)
 
+test.write('myranlib.py', """
+""")
+
 test.write('SConstruct', """
 env = Environment(tools=['default', 'ar'],
                   ARCOM = r'%s myar.py $TARGET $SOURCES',
+                  RANLIBCOM = r'%s myranlib.py $TARGET',
                   LIBPREFIX = '',
                   LIBSUFFIX = '.lib')
 env.Library(target = 'output', source = ['file.1', 'file.2'])
-""" % python)
+""" % (python, python))
 
 test.write('file.1', "file.1\n/*ar*/\n")
 test.write('file.2', "file.2\n/*ar*/\n")
diff --git a/test/AR/ARCOMSTR.py b/test/AR/ARCOMSTR.py
index 933a4e1..f20adb5 100644
--- a/test/AR/ARCOMSTR.py
+++ b/test/AR/ARCOMSTR.py
@@ -47,21 +47,26 @@ for f in sys.argv[2:]:
 sys.exit(0)
 """)
 
+test.write('myranlib.py', """
+""")
+
 test.write('SConstruct', """
 env = Environment(tools=['default', 'ar'],
                   ARCOM = r'%s myar.py $TARGET $SOURCES',
                   ARCOMSTR = 'Archiving $TARGET from $SOURCES',
+                  RANLIBCOM = r'%s myranlib.py $TARGET',
                   LIBPREFIX = '',
                   LIBSUFFIX = '.lib')
 env.Library(target = 'output', source = ['file.1', 'file.2'])
-""" % python)
+""" % (python, python))
 
 test.write('file.1', "file.1\n/*ar*/\n")
 test.write('file.2', "file.2\n/*ar*/\n")
 
 test.run(stdout = test.wrap_stdout("""\
 Archiving output.lib from file.1 file.2
-"""))
+%s myranlib.py output.lib
+""" % python))
 
 test.must_match('output.lib', "file.1\nfile.2\n")
 
diff --git a/test/RANLIB.py b/test/RANLIB/RANLIB.py
index 5002b20..5002b20 100644
--- a/test/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
diff --git a/test/RANLIB/RANLIBCOM.py b/test/RANLIB/RANLIBCOM.py
new file mode 100644
index 0000000..25f2f61
--- /dev/null
+++ b/test/RANLIB/RANLIBCOM.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test the ability to configure the $RANLIBCOM construction variable.
+"""
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myar.py', """
+import sys
+outfile = open(sys.argv[1], 'wb')
+for f in sys.argv[2:]:
+    infile = open(f, 'rb')
+    for l in filter(lambda l: l != '/*ar*/\\n', infile.readlines()):
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myranlib.py', """
+import sys
+lines = open(sys.argv[1], 'rb').readlines()
+outfile = open(sys.argv[1], 'wb')
+for l in filter(lambda l: l != '/*ranlib*/\\n', lines):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(tools=['default', 'ar'],
+                  ARCOM = r'%s myar.py $TARGET $SOURCES',
+                  RANLIBCOM = r'%s myranlib.py $TARGET',
+                  LIBPREFIX = '',
+                  LIBSUFFIX = '.lib')
+env.Library(target = 'output', source = ['file.1', 'file.2'])
+""" % (python, python))
+
+test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
+test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
+
+test.run(arguments = '.')
+
+test.must_match('output.lib', "file.1\nfile.2\n")
+
+
+
+test.pass_test()
diff --git a/test/RANLIB/RANLIBCOMSTR.py b/test/RANLIB/RANLIBCOMSTR.py
new file mode 100644
index 0000000..4e348c0
--- /dev/null
+++ b/test/RANLIB/RANLIBCOMSTR.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# 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__"
+
+"""
+Test that the $RANLIBCOMSTR construction variable allows you to
+customize the displayed archive indexer string.
+"""
+
+import TestSCons
+
+python = TestSCons.python
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myar.py', """
+import sys
+outfile = open(sys.argv[1], 'wb')
+for f in sys.argv[2:]:
+    infile = open(f, 'rb')
+    for l in filter(lambda l: l != '/*ar*/\\n', infile.readlines()):
+        outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('myranlib.py', """
+import sys
+lines = open(sys.argv[1], 'rb').readlines()
+outfile = open(sys.argv[1], 'wb')
+for l in filter(lambda l: l != '/*ranlib*/\\n', lines):
+    outfile.write(l)
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(tools=['default', 'ar'],
+                  ARCOM = r'%s myar.py $TARGET $SOURCES',
+                  RANLIBCOM = r'%s myranlib.py $TARGET',
+                  RANLIBCOMSTR = 'Indexing $TARGET',
+                  LIBPREFIX = '',
+                  LIBSUFFIX = '.lib')
+env.Library(target = 'output', source = ['file.1', 'file.2'])
+""" % (python, python))
+
+test.write('file.1', "file.1\n/*ar*/\n/*ranlib*/\n")
+test.write('file.2', "file.2\n/*ar*/\n/*ranlib*/\n")
+
+test.run(stdout = test.wrap_stdout("""\
+%s myar.py output.lib file.1 file.2
+Indexing output.lib
+""" % python))
+
+test.must_match('output.lib', "file.1\nfile.2\n")
+
+
+
+test.pass_test()
diff --git a/test/RANLIBFLAGS.py b/test/RANLIB/RANLIBFLAGS.py
index 80618ba..80618ba 100644
--- a/test/RANLIBFLAGS.py
+++ b/test/RANLIB/RANLIBFLAGS.py