summaryrefslogtreecommitdiffstats
path: root/test/Java/JAR.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/Java/JAR.py')
-rw-r--r--test/Java/JAR.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index da2e72e..faf01a3 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -52,6 +52,7 @@ sys.exit(0)
""")
test.write('SConstruct', """
+DefaultEnvironment(tools=[])
env = Environment(tools = ['jar'],
JAR = r'%(_python_)s myjar.py')
env.Jar(target = 'test1.jar', source = 'test1.class')
@@ -70,6 +71,7 @@ test.must_match('test1.jar', "test1.class\nline 3\n", mode='r')
if os.path.normcase('.class') == os.path.normcase('.CLASS'):
test.write('SConstruct', """
+DefaultEnvironment(tools=[])
env = Environment(tools = ['jar'],
JAR = r'%(_python_)s myjar.py')
env.Jar(target = 'test2.jar', source = 'test2.CLASS')
@@ -95,6 +97,7 @@ sys.exit(0)
""")
test.write('SConstruct', """
+DefaultEnvironment(tools=[])
env = Environment(tools = ['jar'],
JAR = r'%(_python_)s myjar2.py',
JARFLAGS='cvf')
@@ -126,6 +129,7 @@ where_jar = test.java_where_jar()
test.file_fixture('wrapper_with_args.py')
test.write('SConstruct', """
+DefaultEnvironment(tools=[])
foo = Environment(tools = ['javac', 'jar'],
JAVAC = r'%(where_javac)s',
JAR = r'%(where_jar)s')
@@ -249,6 +253,8 @@ test.subdir('testdir2',
# simple SConstruct which passes the 3 .java as source
# and extracts the jars back to classes
test.write(['testdir2', 'SConstruct'], """
+DefaultEnvironment(tools=[])
+
foo = Environment()
foo.Jar(target = 'foobar', source = [
'com/javasource/JavaFile1.java',
@@ -337,6 +343,7 @@ test.must_exist(['testdir2', 'barTest', 'com', 'javasource', 'JavaFile3.class'])
# make some directories to test in
test.subdir('listOfLists',
+ ['manifest_dir'],
['listOfLists', 'src'],
['listOfLists', 'src', 'com'],
['listOfLists', 'src', 'com', 'javasource'],
@@ -344,16 +351,18 @@ test.subdir('listOfLists',
# test varient dir and lists of lists
test.write(['listOfLists', 'SConstruct'], """
+DefaultEnvironment(tools=[])
+
foo = Environment()
foo.VariantDir('build', 'src', duplicate=0)
+foo.VariantDir('test', '../manifest_dir', duplicate=0)
sourceFiles = ["src/com/javasource/JavaFile1.java", "src/com/javasource/JavaFile2.java", "src/com/javasource/JavaFile3.java",]
list_of_class_files = foo.Java('build', source=sourceFiles)
resources = ['build/com/resource/resource1.txt', 'build/com/resource/resource2.txt']
for resource in resources:
foo.Command(resource, list_of_class_files, Copy(resource, resource.replace('build','src')))
-foo.Command('build/MANIFEST.mf', list_of_class_files, Copy('build/MANIFEST.mf', 'MANIFEST.mf'))
contents = [list_of_class_files, resources]
-foo.Jar(target = 'lists', source = contents + ['build/MANIFEST.mf'], JARCHDIR='build')
+foo.Jar(target = 'lists', source = contents + ['test/MANIFEST.mf'], JARCHDIR='build')
foo.Command("listsTest", [], Mkdir("listsTest") )
foo.Command('listsTest/src/com/javasource/JavaFile3.java', 'lists.jar', foo['JAR'] + ' xvf ../lists.jar', chdir='listsTest')
""")
@@ -394,7 +403,7 @@ public class JavaFile3
}
""")
-test.write(['listOfLists', 'MANIFEST.mf'],
+test.write(['manifest_dir','MANIFEST.mf'],
"""Manifest-Version: 1.0
MyManifestTest: Test
""")
@@ -434,6 +443,8 @@ test.subdir('testdir3',
# Create the jars then extract them back to check contents
test.write(['testdir3', 'SConstruct'], """
+DefaultEnvironment(tools=[])
+
foo = Environment()
bar = foo.Clone()
foo.Java(target = 'classes', source = 'com/sub/foo')