Skip to content
Snippets Groups Projects
Commit 3e6d3e0b authored by akwizgran's avatar akwizgran
Browse files

Downgraded H2 to version 1.3.170 (last version that supports Java 1.5).

parent b2e7f9f3
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="lib" path="libs/jna-3.5.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="libs/platform-3.5.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="libs/h2small-1.3.172.jar"/>
<classpathentry kind="lib" path="libs/jtorctl-briar.jar"/>
<classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
File added
File deleted
Binary files h2-1.3.170/h2/bin/org/h2/build/Build$1.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build$1.class differ
Binary files h2-1.3.170/h2/bin/org/h2/build/Build$2.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build$2.class differ
Binary files h2-1.3.170/h2/bin/org/h2/build/BuildBase.class and h2-1.3.170-briar/h2/bin/org/h2/build/BuildBase.class differ
Binary files h2-1.3.170/h2/bin/org/h2/build/Build.class and h2-1.3.170-briar/h2/bin/org/h2/build/Build.class differ
diff -Bbur h2-1.3.170/h2/src/tools/org/h2/build/BuildBase.java h2-1.3.170-briar/h2/src/tools/org/h2/build/BuildBase.java
--- h2-1.3.170/h2/src/tools/org/h2/build/BuildBase.java 2013-06-19 15:56:33.000000000 +0100
+++ h2-1.3.170-briar/h2/src/tools/org/h2/build/BuildBase.java 2013-06-19 16:03:20.000000000 +0100
@@ -838,6 +838,9 @@
*/
protected void javac(StringList args, FileList files) {
println("Compiling " + files.size() + " classes");
+ print("Args:");
+ for(String arg : args) print(" " + arg);
+ println("");
StringList params = new StringList();
params.addAll(args);
params.addAll(getPaths(files.keep(".java")));
diff -Bbur h2-1.3.170/h2/src/tools/org/h2/build/Build.java h2-1.3.170-briar/h2/src/tools/org/h2/build/Build.java
--- h2-1.3.170/h2/src/tools/org/h2/build/Build.java 2013-06-19 15:56:33.000000000 +0100
+++ h2-1.3.170-briar/h2/src/tools/org/h2/build/Build.java 2013-06-19 16:05:10.000000000 +0100
@@ -166,10 +166,11 @@
files = files("src/main");
}
StringList args = args();
- if (System.getProperty("version") != null) {
+ String version = System.getProperty("version");
String bcp = System.getProperty("bcp");
// /System/Library/Frameworks/JavaVM.framework/Versions/1.4/Classes/classes.jar
- args = args.plus("-source", "1.5", "-target", "jsr14", "-bootclasspath", bcp);
+ if (version != null && bcp != null) {
+ args = args.plus("-source", "1.5", "-target", version, "-bootclasspath", bcp);
}
if (debugInfo) {
args = args.plus("-Xlint:unchecked", "-d", "temp", "-sourcepath", "src/main", "-classpath", classpath);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment