From b844c1040bebd9964279a3cd500a62dbea0e42d6 Mon Sep 17 00:00:00 2001 From: knaccc Date: Sat, 2 Feb 2019 03:20:30 +0000 Subject: [PATCH] fixed Mac app native libs --- README.md | 2 +- bin/build-launcher.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e28c3e9..a97e119 100755 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ or `dist/linux/router/bin/launch-gui.sh` To run the MacOS router, type: `dist/mac/router/bin/launch.sh` -or run the app located in `dist/mac/router-app/i2p-zero.app` +or run the app located in `dist/mac/router/i2p-zero.app` For Windows, run: diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index bca6c31..095c3fa 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -62,20 +62,23 @@ 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 # remove unnecessary native libs from jbigi.jar -for i in linux mac win linux-gui mac-gui win-gui; do +for i in linux mac win; do for j in freebsd linux mac win; do if [ "$i" != "$j" ]; then if [ "$j" = "mac" ]; then j="osx"; fi if [ "$j" = "win" ]; then j="windows"; fi zip -d $basedir/dist/$i/router/i2p.base/jbigi.jar *-${j}-* + zip -d $basedir/dist/$i-gui/router/i2p.base/jbigi.jar *-${j}-* fi done done -mkdir -p $basedir/dist/mac-gui/router-app/ -cp -R $basedir/resources/i2p-zero.app $basedir/dist/mac-gui/router-app/ -mv $basedir/dist/mac-gui/router/* $basedir/dist/mac-gui/router-app/i2p-zero.app/Contents/MacOS/ -rm -fr $basedir/dist/mac-gui/router +# build map app structure +mv $basedir/dist/mac-gui/router $basedir/dist/mac-gui/router-tmp +mkdir -p $basedir/dist/mac-gui/router +cp -R $basedir/resources/i2p-zero.app $basedir/dist/mac-gui/router/ +mv $basedir/dist/mac-gui/router-tmp/* $basedir/dist/mac-gui/router/i2p-zero.app/Contents/MacOS/ +rm -fr $basedir/dist/mac-gui/router-tmp du -sk dist/* | awk '{printf "%.1f MB %s\n",$1/1024,$2}'