wownero
/
i2p-zero
mirror of https://github.com/i2p-zero/i2p-zero
5
1
Fork 0
Code Issues Releases Wiki Activity

executable wrapper build fixes

Browse Source
pull/13/head
knaccc 5 years ago
parent d739134fe0
commit 6518b6e054
11 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File

10
README.md
Unescape View File

@ -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 <a href="https://github.com/AdoptOpenJDK/openjdk-build/issues/878">AdoptOpenJDK issue<a> is fixed, note that for the Windows GUI to run, you may need to install the latest <a href="https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads">Microsoft Visual C++ Redistributable</a>
For Windows, double-click the app located at `dist/windows-gui/router/i2p-zero.exe`
## Running the command line version

10
bin/build-launcher.sh
Unescape View File

@ -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

8
bin/import-packages.sh
Unescape View File

@ -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

4
bin/java-config.sh
Unescape View File

@ -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`

1
org.getmonero.i2p.zero/src/module-info.java
Unescape View File

@ -1,5 +1,6 @@
module org.getmonero.i2p.zero {
requires combined;
requires jdk.crypto.ec;
requires java.naming;
exports org.getmonero.i2p.zero;
}

4
org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/RouterWrapper.java
Unescape View File

@ -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);

2
resources/i2p-zero.linux.cfg
Unescape View File

@ -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

2
resources/i2p-zero.win.cfg
Unescape View File

@ -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

2
resources/launch-gui.sh
Unescape View File

@ -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

2
resources/launch.bat
Unescape View File

@ -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 %*
"%DIR%\java" -cp %DIR%\..\i2p.base\jbigi.jar -m org.getmonero.i2p.zero %*

2
resources/launch.sh
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save