diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-11-13 18:58:06 (GMT) |
| commit | c2aba592affffdb12d2f95e251ccfc566b6dd674 (patch) | |
| tree | 3f1719afc1ec7408135659f154f4b4072f8b44af /test/Java/source-files.py | |
| parent | ade84bc59db524fbccd670bfadefa786407c7c0b (diff) | |
| parent | 648cf42a89845ccad012e02609ca8958e62ce272 (diff) | |
| download | SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.zip SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.gz SCons-c2aba592affffdb12d2f95e251ccfc566b6dd674.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'test/Java/source-files.py')
| -rw-r--r-- | test/Java/source-files.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/Java/source-files.py b/test/Java/source-files.py index bf263cf..e5cb8b6 100644 --- a/test/Java/source-files.py +++ b/test/Java/source-files.py @@ -35,12 +35,12 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() +# Keep this logic because it skips the test if javac or jar not found. where_javac, java_version = test.java_where_javac() - +where_jar = test.java_where_jar() test.write('SConstruct', """ -env = Environment(tools = ['javac', 'javah'], - JAVAC = r'%(where_javac)s') +env = Environment(tools = ['javac', 'javah']) env.Java(target = 'class1', source = 'com/Example1.java') env.Java(target = 'class2', source = ['com/Example2.java', 'com/Example3.java']) """ % locals()) |