diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index 7ac09a3..ef561a5 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -43,21 +43,32 @@ for i in linux mac win; do $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:import/javafx-jmods/$i/javafx-jmods-${JAVAFX_VERSION}:target/modules:target/org.getmonero.i2p.zero.jar:target/org.getmonero.i2p.zero.gui.jar --add-modules org.getmonero.i2p.zero,org.getmonero.i2p.zero.gui,javafx.controls,javafx.fxml,java.desktop --output dist/$i-gui/router --strip-debug --compress 2 --no-header-files --no-man-pages done +cp -R $basedir/resources/i2p-zero.app $basedir/dist/mac-gui/router/bin/ + for i in linux mac linux-gui mac-gui; do - cp $basedir/resources/launch.sh $basedir/dist/$i/router/bin/ - cp $basedir/resources/tunnel-control.sh $basedir/dist/$i/router/bin/ + if [ $i = mac-gui ]; then + mac_root=$basedir/dist/$i/router/bin/i2p-zero.app/Contents/MacOS + cp $basedir/resources/tunnel-control.sh $mac_root/ + mv $basedir/dist/$i/router/bin/java $mac_root/ + mv $basedir/dist/$i/router/bin/jrunscript $mac_root/ + mv $basedir/dist/$i/router/bin/keytool $mac_root/ + else + cp $basedir/resources/launch.sh $basedir/dist/$i/router/bin/ + cp $basedir/resources/tunnel-control.sh $basedir/dist/$i/router/bin/ + fi done for i in win win-gui; do cp $basedir/resources/launch.bat $basedir/dist/$i/router/bin/ done -for i in linux-gui mac-gui; do +for i in linux-gui; do cp $basedir/resources/launch-gui.sh $basedir/dist/$i/router/bin/ done for i in win-gui; do cp $basedir/resources/launch-gui.bat $basedir/dist/$i/router/bin/ done + for i in linux mac win linux-gui mac-gui win-gui; do cp -r $basedir/import/i2p.base $basedir/dist/$i/router/; done for i in linux mac win linux-gui mac-gui win-gui; do mkdir -p $basedir/dist/$i/router/i2p.config; done diff --git a/resources/i2p-zero.app/Contents/Info.plist b/resources/i2p-zero.app/Contents/Info.plist new file mode 100644 index 0000000..41d660d --- /dev/null +++ b/resources/i2p-zero.app/Contents/Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleGetInfoString + i2p-zero + CFBundleExecutable + launch-gui.sh + CFBundleIdentifier + org.getmonero.i2p.zero.gui + CFBundleName + i2p-zero + CFBundleIconFile + app-icon + CFBundleShortVersionString + 0.01 + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + IFMajorVersion + 0 + IFMinorVersion + 1 + + diff --git a/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh b/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh new file mode 100755 index 0000000..933aa9f --- /dev/null +++ b/resources/i2p-zero.app/Contents/MacOS/launch-gui.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +wd=${0%/*} +cd "$wd" +basedir="$wd/../../../.." +./java -cp $basedir/i2p.base/jbigi.jar -m org.getmonero.i2p.zero.gui --i2p.dir.base=$basedir/i2p.base --i2p.dir.config=$basedir/i2p.config diff --git a/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh b/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh new file mode 100755 index 0000000..24ad902 --- /dev/null +++ b/resources/i2p-zero.app/Contents/MacOS/tunnel-control.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +exec 3<>/dev/tcp/localhost/30000; echo "$1 $2 $3" >&3; cat <&3 \ No newline at end of file diff --git a/resources/i2p-zero.app/Contents/Resources/app-icon.icns b/resources/i2p-zero.app/Contents/Resources/app-icon.icns new file mode 100644 index 0000000..5a18ced Binary files /dev/null and b/resources/i2p-zero.app/Contents/Resources/app-icon.icns differ