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/JAVACLASSPATH.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/JAVACLASSPATH.py')
| -rw-r--r-- | test/Java/JAVACLASSPATH.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test/Java/JAVACLASSPATH.py b/test/Java/JAVACLASSPATH.py index bc3bb21..fb2b33f 100644 --- a/test/Java/JAVACLASSPATH.py +++ b/test/Java/JAVACLASSPATH.py @@ -40,17 +40,15 @@ where_javac, java_version = test.java_where_javac() where_javah = test.java_where_javah() test.write('SConstruct', """ -env = Environment(tools = ['javac', 'javah'], - JAVAC = r'%(where_javac)s', - JAVAH = r'%(where_javah)s') -j1 = env.Java(target = 'class1', source = 'com1/Example1.java') -j2 = env.Java(target = 'class2', source = 'com2/Example2.java') +env = Environment(tools = ['javac', 'javah']) +j1 = env.Java(target = 'class1', source = 'com.1/Example1.java') +j2 = env.Java(target = 'class2', source = 'com.2/Example2.java') env.JavaH(target = 'outdir', source = [j1, j2], JAVACLASSPATH = 'class2') """ % locals()) -test.subdir('com1', 'com2') +test.subdir('com.1', 'com.2') -test.write(['com1', 'Example1.java'], """\ +test.write(['com.1', 'Example1.java'], """\ package com; public class Example1 @@ -64,7 +62,7 @@ public class Example1 } """) -test.write(['com2', 'Example2.java'], """\ +test.write(['com.2', 'Example2.java'], """\ package com; public class Example2 |