Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Upgraded H2 to version 1.3.174.

Browse Source 
As we no longer support Java 1.5 we can stay up to date with H2
releases.
This commit is contained in:
akwizgran
2013-11-26 12:32:22 +00:00
parent 27c4306e03
commit 222d7414d7
4 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-core/.classpath
View File

@@ -3,10 +3,10 @@
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/briar-api"/>
<classpathentry kind="lib" path="/briar-api/libs/guice-3.0-no_aop.jar"/>
<classpathentry kind="lib" path="libs/h2small-1.3.170.jar"/>
<classpathentry kind="lib" path="libs/javax.inject.jar"/>
<classpathentry kind="lib" path="libs/sc-light-jdk15on-1.47.0.3-SNAPSHOT.jar" sourcepath="libs/source/sc-light-jdk15on-1.47.0.3-SNAPSHOT-source.jar"/>
<classpathentry kind="lib" path="libs/weupnp-0.1.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="libs/h2small-1.3.174.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

BIN
briar-core/libs/h2small-1.3.170.jar
View File

Binary file not shown.

BIN
briar-core/libs/h2small-1.3.174.jar Normal file
View File

Binary file not shown.

34
h2-1.3.170.patch
View File

@@ -1,34 +0,0 @@
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);