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

linux moved to adoptopenjdk12, with libjli.so location javapackager11 compatibility fix

Browse Source 
mac moved to adoptopenjdk12
win moved to adoptopenjdk12 which now has all necessary dlls
pull/13/head
knaccc 5 years ago
parent 5a42a3257f
commit a31043863a
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
README.md
Unescape View File

@ -40,9 +40,9 @@ Then, retrieve this project from git:
`git clone https://github.com/knaccc/i2p-zero.git` `git clone https://github.com/knaccc/i2p-zero.git`
Note that the current version of this script uses jdk-11.0.2. If this version of Java becomes no longer available for Note that the current version of this script uses jdk-12. If this version of Java becomes no longer available for
download, then update the references to jdk-11.0.2 in java-config.sh to the later version. To locate a recent download, then update the references in java-config.sh to the later version. To locate a recent
JDK download URL, see https://jdk.java.net/11/ JDK download URL, see https://jdk.java.net/12/
Also note that JDKs for Linux, MacOS and Windows will be downloaded, which will total several hundred megabytes. Also note that JDKs for Linux, MacOS and Windows will be downloaded, which will total several hundred megabytes.

5
bin/build-launcher.sh
Unescape View File

@ -110,6 +110,11 @@ done
cp "$basedir/resources/i2p-zero.win.cfg" "$basedir/dist/win-gui/router/app/i2p-zero.cfg" cp "$basedir/resources/i2p-zero.win.cfg" "$basedir/dist/win-gui/router/app/i2p-zero.cfg"
# linux-gui launcher: fix location of libjli.so due to slight incompatibility with javapackager11 when used with jdk12 hotspot VM
mkdir "$basedir/dist/linux-gui/router/runtime/lib/jli"
cp "$basedir/dist/linux-gui/router/runtime/lib/libjli.so" "$basedir/dist/linux-gui/router/runtime/lib/jli/"
# show distribution sizes # show distribution sizes
du -sk dist/* | awk '{printf "%.1f MB %s\n",$1/1024,$2}' du -sk dist/* | awk '{printf "%.1f MB %s\n",$1/1024,$2}'

20
bin/java-config.sh
Unescape View File

@ -8,19 +8,19 @@ fi
export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz JDK_DOWNLOAD_FILENAME_LINUX=OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz
JDK_DOWNLOAD_FILENAME_MAC=OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz JDK_DOWNLOAD_FILENAME_MAC=OpenJDK12U-jdk_x64_mac_hotspot_12_33.tar.gz
JDK_DOWNLOAD_FILENAME_WIN=openjdk-11.0.2_windows-x64_bin.zip JDK_DOWNLOAD_FILENAME_WIN=OpenJDK12U-jdk_x64_windows_hotspot_12_33.zip
JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_linux_hotspot_11.0.1_13.tar.gz JDK_DOWNLOAD_URL_LINUX=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_linux_hotspot_12_33.tar.gz
JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.1%2B13/OpenJDK11U-jdk_x64_mac_hotspot_11.0.1_13.tar.gz JDK_DOWNLOAD_URL_MAC=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_mac_hotspot_12_33.tar.gz
JDK_DOWNLOAD_URL_WIN=https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip JDK_DOWNLOAD_URL_WIN=https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12%2B33/OpenJDK12U-jdk_x64_windows_hotspot_12_33.zip
JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-11.0.1+13 JAVA_HOME_LINUX=$basedir/import/jdks/linux/jdk-12+33
JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-11.0.1+13/Contents/Home JAVA_HOME_MAC=$basedir/import/jdks/mac/jdk-12+33/Contents/Home
JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-11.0.2 JAVA_HOME_WIN=$basedir/import/jdks/win/jdk-12+33
JAVAFX_VERSION=11.0.2 JAVAFX_VERSION=12
JAVAFX_SDK_DOWNLOAD_URL_LINUX=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_linux-x64_bin-sdk.zip JAVAFX_SDK_DOWNLOAD_URL_LINUX=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_linux-x64_bin-sdk.zip
JAVAFX_SDK_DOWNLOAD_URL_MAC=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_osx-x64_bin-sdk.zip JAVAFX_SDK_DOWNLOAD_URL_MAC=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_osx-x64_bin-sdk.zip
JAVAFX_SDK_DOWNLOAD_URL_WIN=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_windows-x64_bin-sdk.zip JAVAFX_SDK_DOWNLOAD_URL_WIN=https://download2.gluonhq.com/openjfx/$JAVAFX_VERSION/openjfx-${JAVAFX_VERSION}_windows-x64_bin-sdk.zip

18
org.getmonero.i2p.zero.gui/org.getmonero.i2p.zero.gui.iml
Unescape View File

@ -7,10 +7,11 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="org.getmonero.i2p.zero" />
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx-swt.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx-swt.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -19,7 +20,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.base.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.base.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -28,7 +29,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.controls.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.controls.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -37,7 +38,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.fxml.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.fxml.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -46,7 +47,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.graphics.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.graphics.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -55,7 +56,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.media.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.media.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -64,7 +65,7 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.swing.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.swing.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
@ -73,12 +74,11 @@
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>
<root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-11.0.2/lib/javafx.web.jar!/" /> <root url="jar://$MODULE_DIR$/../import/javafx-sdks/mac/javafx-sdk-12/lib/javafx.web.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module" module-name="org.getmonero.i2p.zero" />
</component> </component>
</module> </module>
Write Preview
Loading…
Cancel
Save