zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update: Enable libjbigi update for ARM

Browse Source
This commit is contained in:
zzz
2016-04-29 22:34:55 +00:00
parent 9128c79e05
commit 139f386fb8
3 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
history.txt
View File

@@ -1,3 +1,19 @@
2016-04-29 zzz
* Debian:
- Add runtime dependency on gettext-base,
link to /usr/share/java/libintl.jar
- Add runtime dependency on libgetopt-java,
link to /usr/share/java/gnu-getopt.jar
* SysTray:
- Remove systray4j.jar from linux installers
- Move SysTray.java to SysTrayImpl.java
- New SysTray.java that instantiates SysTrayImpl
by reflection, so the SysTrayImpl.java source is optional
- Remove systray4j.jar, systray4j.dll, and SysTrayImpl.java
from Debian source packages
- Remove systray4j.jar from Debian binary packages
* Update: Enable libjbigi update for ARM
2016-04-28 zzz 2016-04-28 zzz
* News: Parse and store CRLs in news feed * News: Parse and store CRLs in news feed

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 7; public final static long BUILD = 8;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";

47
router/java/src/net/i2p/router/tasks/InstallUpdate.java
View File

@@ -135,36 +135,39 @@ public class InstallUpdate {
boolean goodOS = isWin || isMac || boolean goodOS = isWin || isMac ||
osName.contains("linux") || osName.contains("freebsd"); osName.contains("linux") || osName.contains("freebsd");
// only do this on these x86
File jbigiJar = new File(context.getBaseDir(), "lib/jbigi.jar"); File jbigiJar = new File(context.getBaseDir(), "lib/jbigi.jar");
if (isX86 && goodOS && jbigiJar.exists()) { if (goodOS && jbigiJar.exists()) {
String libPrefix = (isWin ? "" : "lib"); String libPrefix = (isWin ? "" : "lib");
String libSuffix = (isWin ? ".dll" : isMac ? ".jnilib" : ".so"); String libSuffix = (isWin ? ".dll" : isMac ? ".jnilib" : ".so");
File jcpuidLib = new File(context.getBaseDir(), libPrefix + "jcpuid" + libSuffix); if (isX86) {
if (jcpuidLib.canWrite() && jbigiJar.lastModified() > jcpuidLib.lastModified()) { File jcpuidLib = new File(context.getBaseDir(), libPrefix + "jcpuid" + libSuffix);
String path = jcpuidLib.getAbsolutePath(); if (jcpuidLib.canWrite() && jbigiJar.lastModified() > jcpuidLib.lastModified()) {
boolean success = FileUtil.copy(path, path + ".bak", true, true); String path = jcpuidLib.getAbsolutePath();
if (success) { boolean success = FileUtil.copy(path, path + ".bak", true, true);
boolean success2 = jcpuidLib.delete(); if (success) {
if (success2) { boolean success2 = jcpuidLib.delete();
System.out.println("New jbigi.jar detected, moved jcpuid library to " + if (success2) {
path + ".bak"); System.out.println("New jbigi.jar detected, moved jcpuid library to " +
System.out.println("Check logs for successful installation of new library"); path + ".bak");
System.out.println("Check logs for successful installation of new library");
}
} }
} }
} }
File jbigiLib = new File(context.getBaseDir(), libPrefix + "jbigi" + libSuffix); if (isX86 || SystemVersion.isARM()) {
if (jbigiLib.canWrite() && jbigiJar.lastModified() > jbigiLib.lastModified()) { File jbigiLib = new File(context.getBaseDir(), libPrefix + "jbigi" + libSuffix);
String path = jbigiLib.getAbsolutePath(); if (jbigiLib.canWrite() && jbigiJar.lastModified() > jbigiLib.lastModified()) {
boolean success = FileUtil.copy(path, path + ".bak", true, true); String path = jbigiLib.getAbsolutePath();
if (success) { boolean success = FileUtil.copy(path, path + ".bak", true, true);
boolean success2 = jbigiLib.delete(); if (success) {
if (success2) { boolean success2 = jbigiLib.delete();
System.out.println("New jbigi.jar detected, moved jbigi library to " + if (success2) {
path + ".bak"); System.out.println("New jbigi.jar detected, moved jbigi library to " +
System.out.println("Check logs for successful installation of new library"); path + ".bak");
System.out.println("Check logs for successful installation of new library");
}
} }
} }
} }