From 6518b6e054f6e313b022b702ca4a6b643bb9941f Mon Sep 17 00:00:00 2001 From: knaccc Date: Mon, 11 Feb 2019 03:42:34 +0000 Subject: [PATCH] executable wrapper build fixes --- README.md | 10 ++-------- bin/build-launcher.sh | 10 +++++----- bin/import-packages.sh | 8 ++++---- bin/java-config.sh | 4 ++-- org.getmonero.i2p.zero/src/module-info.java | 1 + .../src/org/getmonero/i2p/zero/RouterWrapper.java | 4 ++++ resources/i2p-zero.linux.cfg | 2 +- resources/i2p-zero.win.cfg | 2 +- resources/launch-gui.sh | 2 +- resources/launch.bat | 2 +- resources/launch.sh | 2 +- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 37db08c..acc3fc1 100755 --- a/README.md +++ b/README.md @@ -55,17 +55,11 @@ the jlink tool to build zero-dependency platform-specific launchers. ## Running the GUI -To run the Linux router, type: - -`dist/linux-gui/router/bin/launch-gui.sh` -or double-click the `dist/linux-gui/router/i2p-zero.desktop` file +To run the Linux router, double-click the app located at `dist/linux-gui/router/i2p-zero` To run the MacOS router, double-click the app located at `dist/mac-gui/router/i2p-zero.app` -For Windows, double-click on `dist/windows-gui/router/bin/launch-gui.bat` - -Until this AdoptOpenJDK issue is fixed, note that for the Windows GUI to run, you may need to install the latest Microsoft Visual C++ Redistributable - +For Windows, double-click the app located at `dist/windows-gui/router/i2p-zero.exe` ## Running the command line version diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index bbef205..7debdd5 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -84,7 +84,7 @@ mv "$basedir/dist/linux-gui/router" "$basedir/dist/linux-gui/router-tmp" mkdir -p "$basedir/dist/linux-gui/router/app" mkdir -p "$basedir/dist/linux-gui/router/resources" -mv "$basedir/dist/linux-gui/router-tmp" "$basedir/dist/linux-gui/runtime" +mv "$basedir/dist/linux-gui/router-tmp" "$basedir/dist/linux-gui/router/runtime" cp "$basedir/import/javapackager/linux/jdk/packager/internal/resources/linux/papplauncher" "$basedir/dist/linux-gui/router/i2p-zero" cp "$basedir/import/javapackager/linux/jdk/packager/internal/resources/linux/libpackager.so" "$basedir/dist/linux-gui/router/" @@ -98,13 +98,13 @@ cp "$basedir/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/icon.png" mv "$basedir/dist/win-gui/router" "$basedir/dist/win-gui/router-tmp" mkdir -p "$basedir/dist/win-gui/router/app" -mv "$basedir/dist/win-gui/router-tmp" "$basedir/dist/win-gui/runtime" +mv "$basedir/dist/win-gui/router-tmp" "$basedir/dist/win-gui/router/runtime" cp "$basedir/resources/wrapper.exe" "$basedir/dist/win-gui/router/i2p-zero.exe" cp "$basedir/import/javapackager/win/jdk/packager/internal/resources/windows/packager.dll" "$basedir/dist/win-gui/router/" for i in msvcp140.dll vcruntime140.dll; do - cp "$basedir/dist/win-gui/runtime/bin/$i" "$basedir/dist/win-gui/router/" + cp "$basedir/dist/win-gui/router/runtime/bin/$i" "$basedir/dist/win-gui/router/" done cp "$basedir/resources/i2p-zero.win.cfg" "$basedir/dist/win-gui/router/app/i2p-zero.cfg" @@ -123,9 +123,9 @@ if [ $os_name = Darwin ]; then elif [ $os_name = Linux ]; then os_name=linux echo "To run from the command line, type: ./dist/$os_name/router/bin/launch.sh" - echo "To run the GUI, type: dist/$os_name-gui/router/bin/launch-gui.sh" + echo "To run the GUI, double-click: dist/$os_name-gui/router/i2p-zero" else os_name=win echo "To run from the command line, type: ./dist/$os_name/router/bin/launch.bat" - echo "To run the GUI, double-click: dist/$os_name-gui/router/bin/launch-gui.bat" + echo "To run the GUI, double-click: dist/$os_name-gui/router/i2p-zero.exe" fi diff --git a/bin/import-packages.sh b/bin/import-packages.sh index 8e0a775..51683e8 100755 --- a/bin/import-packages.sh +++ b/bin/import-packages.sh @@ -77,13 +77,13 @@ fi if [ ! -d "$basedir/import/javapackager" ]; then mkdir -p javapackager mkdir -p javapackager/linux javapackager/win - wget --directory-prefix=javafx-jmods/linux $JPACKAGER_DOWNLOAD_URL_LINUX - wget --directory-prefix=javafx-jmods/win $JPACKAGER_DOWNLOAD_URL_WIN + wget --directory-prefix=javapackager/linux $JPACKAGER_DOWNLOAD_URL_LINUX + wget --directory-prefix=javapackager/win $JPACKAGER_DOWNLOAD_URL_WIN unzip javapackager/linux/$JPACKAGER_DOWNLOAD_FILENAME_LINUX -d javapackager/linux/ unzip javapackager/win/$JPACKAGER_DOWNLOAD_FILENAME_WIN -d javapackager/win/ - unzip javapackager/linux/jdk.packager.jar - unzip javapackager/win/jdk.packager.jar + unzip javapackager/linux/jdk.packager.jar -d javapackager/linux/ + unzip javapackager/win/jdk.packager.jar -d javapackager/win/ fi diff --git a/bin/java-config.sh b/bin/java-config.sh index 64bb247..a52a2d0 100644 --- a/bin/java-config.sh +++ b/bin/java-config.sh @@ -36,8 +36,8 @@ JAVAFX_JMODS_DOWNLOAD_FILENAME_WIN=openjfx-${JAVAFX_VERSION}_windows-x64_bin-jmo JPACKAGER_DOWNLOAD_URL_LINUX=http://download2.gluonhq.com/jpackager/11/jdk.packager-linux.zip JPACKAGER_DOWNLOAD_URL_WIN=http://download2.gluonhq.com/jpackager/11/jdk.packager-windows.zip -JPACKAGER_DOWNLOAD_FILENAME_LINUX=http://download2.gluonhq.com/jpackager/11/jdk.packager-linux.zip -JPACKAGER_DOWNLOAD_FILENAME_WIN=http://download2.gluonhq.com/jpackager/11/jdk.packager-windows.zip +JPACKAGER_DOWNLOAD_FILENAME_LINUX=jdk.packager-linux.zip +JPACKAGER_DOWNLOAD_FILENAME_WIN=jdk.packager-windows.zip OS=`uname -s` diff --git a/org.getmonero.i2p.zero/src/module-info.java b/org.getmonero.i2p.zero/src/module-info.java index e471e87..eb78e82 100644 --- a/org.getmonero.i2p.zero/src/module-info.java +++ b/org.getmonero.i2p.zero/src/module-info.java @@ -1,5 +1,6 @@ module org.getmonero.i2p.zero { requires combined; requires jdk.crypto.ec; + requires java.naming; exports org.getmonero.i2p.zero; } \ No newline at end of file diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java index 0ee023f..e64d45c 100644 --- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java +++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java @@ -31,6 +31,10 @@ public class RouterWrapper { public RouterWrapper(Properties routerProperties) { this.routerProperties = routerProperties; + if(!routerProperties.contains("i2p.dir.base.template")) { + routerProperties.put("i2p.dir.base.template", new File(new File(System.getProperty("java.home")), "i2p.base").getAbsolutePath()); + } + int bandwidthLimitKBps = loadBandwidthLimitKBps(); routerProperties.put("i2np.inboundKBytesPerSecond", bandwidthLimitKBps); routerProperties.put("i2np.outboundKBytesPerSecond", bandwidthLimitKBps); diff --git a/resources/i2p-zero.linux.cfg b/resources/i2p-zero.linux.cfg index 817ee24..79acb10 100644 --- a/resources/i2p-zero.linux.cfg +++ b/resources/i2p-zero.linux.cfg @@ -4,7 +4,7 @@ app.version=1.0 app.preferences.id= app.runtime=$APPDIR/runtime app.identifier= -app.classpath= +app.classpath=$APPDIR/runtime/i2p.base/jbigi.jar app.application.instance=single app.mainmodule=org.getmonero.i2p.zero.gui packager.java.version=11.0.1 diff --git a/resources/i2p-zero.win.cfg b/resources/i2p-zero.win.cfg index d222e89..919ab7b 100644 --- a/resources/i2p-zero.win.cfg +++ b/resources/i2p-zero.win.cfg @@ -4,7 +4,7 @@ app.version=1.0 app.preferences.id= app.runtime=$APPDIR\runtime app.identifier= -app.classpath= +app.classpath=$APPDIR/runtime/i2p.base/jbigi.jar app.application.instance=single app.mainmodule=org.getmonero.i2p.zero.gui packager.java.version=11.0.2 diff --git a/resources/launch-gui.sh b/resources/launch-gui.sh index 3389003..d61632e 100755 --- a/resources/launch-gui.sh +++ b/resources/launch-gui.sh @@ -6,4 +6,4 @@ else basedir=$(dirname $(dirname $(readlink -fm $0))) fi -"$basedir"/bin/java -cp "$basedir/i2p.base/jbigi.jar" -m org.getmonero.i2p.zero.gui --i2p.dir.base.template="$basedir/i2p.base" +"$basedir"/bin/java -cp "$basedir/i2p.base/jbigi.jar" -m org.getmonero.i2p.zero.gui diff --git a/resources/launch.bat b/resources/launch.bat index 8e1bd26..4425589 100644 --- a/resources/launch.bat +++ b/resources/launch.bat @@ -1,3 +1,3 @@ @echo off set DIR=%~dp0 -"%DIR%\java" -cp %DIR%\..\i2p.base\jbigi.jar -m org.getmonero.i2p.zero --i2p.dir.base.template=%DIR%\..\i2p.base %* \ No newline at end of file +"%DIR%\java" -cp %DIR%\..\i2p.base\jbigi.jar -m org.getmonero.i2p.zero %* \ No newline at end of file diff --git a/resources/launch.sh b/resources/launch.sh index c038789..a74a7d8 100755 --- a/resources/launch.sh +++ b/resources/launch.sh @@ -6,4 +6,4 @@ else basedir=$(dirname $(dirname $(readlink -fm $0))) fi -"$basedir"/bin/java -cp "$basedir/i2p.base/jbigi.jar" -m org.getmonero.i2p.zero --i2p.dir.base.template="$basedir/i2p.base" +"$basedir"/bin/java -cp "$basedir/i2p.base/jbigi.jar" -m org.getmonero.i2p.zero