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

6 files changed, 169 insertions, 3 deletions

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