From 7992aeda99ff6ff87975086dd41aa93bcf54d5d2 Mon Sep 17 00:00:00 2001 From: knaccc Date: Sun, 20 Jan 2019 16:55:07 +0000 Subject: [PATCH] package refactoring --- README.md | 6 +++--- bin/build-launcher.sh | 8 ++++---- resources/launch.bat | 2 +- resources/launch.sh | 2 +- src/module-info.java | 2 +- src/org/getmonero/i2p/{embedded => zero}/Main.java | 2 +- .../getmonero/i2p/{embedded => zero}/TunnelControl.java | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename src/org/getmonero/i2p/{embedded => zero}/Main.java (98%) rename src/org/getmonero/i2p/{embedded => zero}/TunnelControl.java (99%) diff --git a/README.md b/README.md index 77c6302..7159fb9 100755 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ The zero-dependency distribution sizes are as follows: OS | Uncompressed size (MB) | xz Compressed size (MB) ------------ | ------------- | ------------- -Linux | 41.6 | 22.5 -MacOS | 29.5 | 17.5 -Windows | 33.6 | 20.1 +Linux | 41.9 | 22.8 +MacOS | 29.9 | 17.8 +Windows | 33.9 | 20.4 ## Building the launchers diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index b17beae..d14ab0d 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -10,20 +10,20 @@ $JAVA_HOME/bin/javac --module-path import/lib -d target/classes $(find src -name # package as a modular jar echo "*** Packaging as a modular jar" -$JAVA_HOME/bin/jar --create --file target/org.getmonero.i2p.embedded.jar --main-class org.getmonero.i2p.embedded.Main -C target/classes . +$JAVA_HOME/bin/jar --create --file target/org.getmonero.i2p.zero.jar --main-class org.getmonero.i2p.zero.Main -C target/classes . rm -fr $basedir/dist mkdir -p $basedir/dist/linux $basedir/dist/mac $basedir/dist/win # create OS specific launchers which will bundle together the code and a minimal JVM echo "*** Performing jlink (Linux)" -$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/linux/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.embedded.jar --add-modules org.getmonero.i2p.embedded --output dist/linux/router --strip-debug --compress 2 --no-header-files --no-man-pages +$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/linux/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/linux/router --strip-debug --compress 2 --no-header-files --no-man-pages echo "*** Performing jlink (Mac)" -$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/mac/jdk-${JDK_VERSION}.jdk/Contents/Home/jmods:target/modules:target/org.getmonero.i2p.embedded.jar --add-modules org.getmonero.i2p.embedded --output dist/mac/router --strip-debug --compress 2 --no-header-files --no-man-pages +$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/mac/jdk-${JDK_VERSION}.jdk/Contents/Home/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/mac/router --strip-debug --compress 2 --no-header-files --no-man-pages echo "*** Performing jlink (Windows)" -$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/win/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.embedded.jar --add-modules org.getmonero.i2p.embedded --output dist/win/router --strip-debug --compress 2 --no-header-files --no-man-pages +$JAVA_HOME/bin/jlink --module-path $basedir/import/jdks/win/jdk-${JDK_VERSION}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/win/router --strip-debug --compress 2 --no-header-files --no-man-pages for i in linux mac; do diff --git a/resources/launch.bat b/resources/launch.bat index b5b2efe..71aede2 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.embedded --i2p.dir.base=%DIR%\..\i2p.base --i2p.dir.config=%DIR%\..\i2p.config %* \ No newline at end of file +"%DIR%\java" -cp %DIR%\..\i2p.base\jbigi.jar -m org.getmonero.i2p.zero --i2p.dir.base=%DIR%\..\i2p.base --i2p.dir.config=%DIR%\..\i2p.config %* \ No newline at end of file diff --git a/resources/launch.sh b/resources/launch.sh index 716493a..3945a4b 100755 --- a/resources/launch.sh +++ b/resources/launch.sh @@ -2,4 +2,4 @@ basedir=$(dirname $(dirname $(readlink -fm $0))) -$basedir/bin/java -cp $basedir/i2p.base/jbigi.jar -m org.getmonero.i2p.embedded --i2p.dir.base=$basedir/i2p.base --i2p.dir.config=$basedir/i2p.config \ No newline at end of file +$basedir/bin/java -cp $basedir/i2p.base/jbigi.jar -m org.getmonero.i2p.zero --i2p.dir.base=$basedir/i2p.base --i2p.dir.config=$basedir/i2p.config \ No newline at end of file diff --git a/src/module-info.java b/src/module-info.java index 3cb892e..36bf536 100644 --- a/src/module-info.java +++ b/src/module-info.java @@ -1,4 +1,4 @@ -module org.getmonero.i2p.embedded { +module org.getmonero.i2p.zero { requires i2p; requires mstreaming; requires streaming; diff --git a/src/org/getmonero/i2p/embedded/Main.java b/src/org/getmonero/i2p/zero/Main.java similarity index 98% rename from src/org/getmonero/i2p/embedded/Main.java rename to src/org/getmonero/i2p/zero/Main.java index d4f53c2..2f013a3 100644 --- a/src/org/getmonero/i2p/embedded/Main.java +++ b/src/org/getmonero/i2p/zero/Main.java @@ -1,4 +1,4 @@ -package org.getmonero.i2p.embedded; +package org.getmonero.i2p.zero; import java.io.File; import java.util.Properties; diff --git a/src/org/getmonero/i2p/embedded/TunnelControl.java b/src/org/getmonero/i2p/zero/TunnelControl.java similarity index 99% rename from src/org/getmonero/i2p/embedded/TunnelControl.java rename to src/org/getmonero/i2p/zero/TunnelControl.java index aa7d581..dcdc4b1 100644 --- a/src/org/getmonero/i2p/embedded/TunnelControl.java +++ b/src/org/getmonero/i2p/zero/TunnelControl.java @@ -1,4 +1,4 @@ -package org.getmonero.i2p.embedded; +package org.getmonero.i2p.zero; import net.i2p.data.Base64; import net.i2p.i2ptunnel.I2PTunnel;