Merge remote-tracking branch 'upstream/master' into json_debug_time_output

12 files changed, 57 insertions, 15 deletions

diff --git a/test/Java/java_version_image/SConstruct b/test/Java/java_version_image/SConstruct
index 945c864..37e49c2 100644
--- a/test/Java/java_version_image/SConstruct
+++ b/test/Java/java_version_image/SConstruct
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: MIT
+#
+# Copyright The SCons Foundation
 
 AddOption('--javac_path',
           dest='javac_path',
@@ -11,25 +14,20 @@ AddOption('--java_version',
           default='1.6',
           type='string')
 
-path=GetOption('javac_path')
+path = GetOption('javac_path')
 if path[0] == "'":
     path = path[1:-1]
 
 version = GetOption('java_version')
 
-env = Environment(tools = ['javac'],
-                  JAVAVERSION = version,
-                  )
-
-
-env.AppendENVPath('PATH',path)
+DefaultEnvironment(tools=[])
+env = Environment(tools=['javac'], JAVAVERSION=version)
 
+env.AppendENVPath('PATH', path)
 # print('PATH:%s'%env['ENV']['PATH'])
-
-
-env.Java(target = 'class1', source = 'com/sub/foo')
-env.Java(target = 'class2', source = 'com/sub/bar')
-env.Java(target = 'class3', source = ['src1', 'src2'])
-env.Java(target = 'class4', source = ['src4'])
-env.Java(target = 'class5', source = ['src5'])
-env.Java(target = 'class6', source = ['src6'])
+env.Java(target='class1', source='com/sub/foo')
+env.Java(target='class2', source='com/sub/bar')
+env.Java(target='class3', source=['src1', 'src2'])
+env.Java(target='class4', source=['src4'])
+env.Java(target='class5', source=['src5'])
+env.Java(target='class6', source=['src6'])
diff --git a/test/Java/java_version_image/com/sub/bar/Example4.java b/test/Java/java_version_image/com/sub/bar/Example4.java
index 0748d54..f27b16c 100644
--- a/test/Java/java_version_image/com/sub/bar/Example4.java
+++ b/test/Java/java_version_image/com/sub/bar/Example4.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.sub.bar;
 
 public class Example4
diff --git a/test/Java/java_version_image/com/sub/bar/Example5.java b/test/Java/java_version_image/com/sub/bar/Example5.java
index 69d2937..de6d765 100644
--- a/test/Java/java_version_image/com/sub/bar/Example5.java
+++ b/test/Java/java_version_image/com/sub/bar/Example5.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.other;
 
 public class Example5
diff --git a/test/Java/java_version_image/com/sub/bar/Example6.java b/test/Java/java_version_image/com/sub/bar/Example6.java
index 1811b80..85166d4 100644
--- a/test/Java/java_version_image/com/sub/bar/Example6.java
+++ b/test/Java/java_version_image/com/sub/bar/Example6.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.sub.bar;
 
 public class Example6
diff --git a/test/Java/java_version_image/com/sub/foo/Example1.java b/test/Java/java_version_image/com/sub/foo/Example1.java
index 82aac2e..1ce4f84 100644
--- a/test/Java/java_version_image/com/sub/foo/Example1.java
+++ b/test/Java/java_version_image/com/sub/foo/Example1.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.sub.foo;
 
 public class Example1
diff --git a/test/Java/java_version_image/com/sub/foo/Example2.java b/test/Java/java_version_image/com/sub/foo/Example2.java
index 6349ac9..9c9144d 100644
--- a/test/Java/java_version_image/com/sub/foo/Example2.java
+++ b/test/Java/java_version_image/com/sub/foo/Example2.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.other;
 
 public class Example2
diff --git a/test/Java/java_version_image/com/sub/foo/Example3.java b/test/Java/java_version_image/com/sub/foo/Example3.java
index 092f0cd..962262a 100644
--- a/test/Java/java_version_image/com/sub/foo/Example3.java
+++ b/test/Java/java_version_image/com/sub/foo/Example3.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 package com.sub.foo;
 
 public class Example3
diff --git a/test/Java/java_version_image/src1/Example7.java b/test/Java/java_version_image/src1/Example7.java
index 80d94f2..b8304e8 100644
--- a/test/Java/java_version_image/src1/Example7.java
+++ b/test/Java/java_version_image/src1/Example7.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 public class Example7
 {
 
diff --git a/test/Java/java_version_image/src2/Test.java b/test/Java/java_version_image/src2/Test.java
index 6f224b0..c6606a2 100644
--- a/test/Java/java_version_image/src2/Test.java
+++ b/test/Java/java_version_image/src2/Test.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 class Empty {
 }
 
diff --git a/test/Java/java_version_image/src4/NestedExample.java b/test/Java/java_version_image/src4/NestedExample.java
index 531f2e9..ac4edd5 100644
--- a/test/Java/java_version_image/src4/NestedExample.java
+++ b/test/Java/java_version_image/src4/NestedExample.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 // import java.util.*;
 
 public class NestedExample
diff --git a/test/Java/java_version_image/src5/TestSCons.java b/test/Java/java_version_image/src5/TestSCons.java
index 46572c4..d169fd3 100644
--- a/test/Java/java_version_image/src5/TestSCons.java
+++ b/test/Java/java_version_image/src5/TestSCons.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 class TestSCons {
     public static void main(String[] args) {
         Foo[] fooArray = new Foo[] { new Foo() };
diff --git a/test/Java/java_version_image/src6/TestSCons.java b/test/Java/java_version_image/src6/TestSCons.java
index 1aeed2f..abf2077 100644
--- a/test/Java/java_version_image/src6/TestSCons.java
+++ b/test/Java/java_version_image/src6/TestSCons.java
@@ -1,3 +1,7 @@
+// SPDX-License-Identifier: MIT
+//
+// Copyright The SCons Foundation
+
 class test
 {
     test()