diff options
author | Steven Knight <knight@baldmt.com> | 2006-02-12 19:56:03 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2006-02-12 19:56:03 (GMT) |
commit | 92e52b195125e7fc89721570c0b9237105d635da (patch) | |
tree | 56208f374c81c91b572cd0fc3cf28223ef80a732 /test/Java/JARCHDIR.py | |
parent | 7bc5b0f51a17b8ea1e49cfe917a98610791d67aa (diff) | |
download | SCons-92e52b195125e7fc89721570c0b9237105d635da.zip SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.gz SCons-92e52b195125e7fc89721570c0b9237105d635da.tar.bz2 |
Add support for Visual Studio 2005 Professional. Windows portability fixes for various tests. (Baptiste Lepilleur)
Diffstat (limited to 'test/Java/JARCHDIR.py')
-rw-r--r-- | test/Java/JARCHDIR.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/test/Java/JARCHDIR.py b/test/Java/JARCHDIR.py index dedcf4a..3ee3dee 100644 --- a/test/Java/JARCHDIR.py +++ b/test/Java/JARCHDIR.py @@ -43,10 +43,18 @@ else: if not where_javac: test.skip_test("Could not find Java javac, skipping test(s).\n") +if test.detect_tool('jar', ENV=ENV): + where_jar = test.detect('JAR', 'jar', ENV=ENV) +else: + where_jar = test.where_is('jar') +if not where_jar: + test.skip_test("Could not find Java jar, skipping test(s).\n") + test.write('SConstruct', """ dir = 'dist' env = Environment(tools = ['javac', 'jar'], - JAVAC = '%(where_javac)s', + JAVAC = r'%(where_javac)s', + JAR = r'%(where_jar)s', JARCHDIR = dir) bin = env.Java(dir, Dir('./')) jar = env.Jar(File('c.jar', dir), bin) |