Merge pull request #1 from jtgrassie/macos-building

tweaks for mac building

.gitignore

@@ -1,4 +1,6 @@
 out/
 target/
 .idea/
-*.swp
+*.swp
+dist/
+import/

bin/build-launcher.sh

@@ -2,7 +2,12 @@
 
 basedir=$(dirname $(dirname $(readlink -fm $0)))
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 # convert the jar files from an existing I2P build into modules suitable for use with jlink
 $basedir/bin/convert-jars-to-modules.sh
@@ -48,4 +53,4 @@ zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-linux-*
 zip -d $basedir/dist/win/router/i2p.base/jbigi.jar *-freebsd-*
 
 echo "*** Done ***"
-echo "To run, type: dist/linux/router/bin/launch.sh"
+echo "To run, type: dist/linux/router/bin/launch.sh"

bin/build-original-i2p.sh

@@ -4,7 +4,12 @@ basedir=$(dirname $(dirname $(readlink -fm $0)))
 
 cd $basedir/import
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 
 # build the jars we're going to modularize

bin/convert-jars-to-modules.sh

@@ -2,7 +2,12 @@
 
 basedir=$(dirname $(dirname $(readlink -fm $0)))
 
-export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+OS=`uname -s`
+if [ $OS = "Darwin" ]; then
+    export JAVA_HOME=`realpath $basedir/import/jdks/mac/jdk-11.0.2.jdk/Contents/Home`
+else
+    export JAVA_HOME=`realpath $basedir/import/jdks/linux/jdk-11.0.2`
+fi
 
 jarPaths=`find $basedir/import/lib -name '*.jar'`