updated jar.py to handle nodes and varanit dirs better, added test for nodes and varient dir.

2 files changed, 10 insertions, 6 deletions

diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py
index 91222d6..49efe6f 100644
--- a/src/engine/SCons/Tool/jar.py
+++ b/src/engine/SCons/Tool/jar.py
@@ -190,7 +190,7 @@ def Jar(env, target = None, source = [], *args, **kw):
                     # check the target nodes to make sure it will be built, then add
                     # it as a source
                     for node in get_all_targets(env):
-                        if(s in str(node) and os.path.splitext(str(node))[1] == ""):
+                        if(s == str(node)):
                             target_classes.append(node)
     # at this point all our sources have been converted to classes or directories of class
     # so pass it to the Jar builder
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index 2353c10..051e051 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -342,14 +342,18 @@ test.subdir('listOfLists',
             ['listOfLists', 'src', 'com', 'javasource'],
             ['listOfLists', 'src', 'com', 'resource'])
 
-# simple SConstruct which passes the 3 .java as source
-# and extracts the jars back to classes
+# test varient dir and lists of lists
 test.write(['listOfLists', 'SConstruct'], """
 foo = Environment()
-list_of_class_files = foo.Java('src', source=['src'])
-resources = ['src/com/resource/resource1.txt', 'src/com/resource/resource2.txt']
+foo.VariantDir('build', 'src', 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 + ['MANIFEST.mf'], JARCHDIR='src')
+foo.Jar(target = 'lists', source = contents + ['build/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')
 """)