diff options
| author | Steven Knight <knight@baldmt.com> | 2005-11-29 06:52:44 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-11-29 06:52:44 (GMT) |
| commit | 3e0e0756b459c354a7f2c16f7157f28ff0d66801 (patch) | |
| tree | 7e345dbc5ddce5dbb3066ea18f84e4d009eb57e9 /test/AR | |
| parent | ae34c4fe43a546089c123f99de190ff79733e848 (diff) | |
| download | SCons-3e0e0756b459c354a7f2c16f7157f28ff0d66801.zip SCons-3e0e0756b459c354a7f2c16f7157f28ff0d66801.tar.gz SCons-3e0e0756b459c354a7f2c16f7157f28ff0d66801.tar.bz2 | |
Add separate $RANLIBCOM and $RANLIBCOMSTR variables. (Christoph Schulz)
Diffstat (limited to 'test/AR')
| -rw-r--r-- | test/AR/ARCOM.py | 6 | ||||
| -rw-r--r-- | test/AR/ARCOMSTR.py | 9 |
2 files changed, 12 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") |