refactor: remove gui

Author: linden

bin/build-launcher.sh

@@ -18,40 +18,17 @@ echo "*** Packaging CLI as a modular jar"
 "$JAVA_HOME"/bin/jar --create --file "$basedir/target/org.getmonero.i2p.zero.jar" --main-class org.getmonero.i2p.zero.Main -C "$basedir/target/classes/org.getmonero.i2p.zero" .
 normalizeZip "$basedir/target/org.getmonero.i2p.zero.jar"
 
-echo "*** Compiling GUI"
-"$JAVA_HOME"/bin/javac --module-path "$basedir/target/org.getmonero.i2p.zero.jar:$basedir/target/modules/combined.jar:$basedir/import/javafx-sdks/linux/javafx-sdk-$JAVAFX_VERSION/lib" -d "$basedir/target/classes/org.getmonero.i2p.zero.gui" $(find "$basedir/org.getmonero.i2p.zero.gui/src" -name '*.java')
-
-cp -r "$basedir/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/"*.{css,png,fxml,ttf} "$basedir/target/classes/org.getmonero.i2p.zero.gui/org/getmonero/i2p/zero/gui/"
-
-echo "*** Packaging GUI as a modular jar"
-"$JAVA_HOME"/bin/jar --create --file "$basedir/target/org.getmonero.i2p.zero.gui.jar" --main-class org.getmonero.i2p.zero.gui.Gui -C "$basedir/target/classes/org.getmonero.i2p.zero.gui" .
-normalizeZip "$basedir/target/org.getmonero.i2p.zero.gui.jar"
-
-for target in ${TARGETS}; do
-  for i in ${target} ${target}-gui; do
-    rm -fr "$basedir/dist/$i"
-    mkdir -p "$basedir/dist/$i"
-  done
-done
-
 # create OS specific launchers which will bundle together the code and a minimal JVM
 for i in ${TARGETS}; do
   echo "*** Performing jlink ($i)"
 
   JAVA_HOME_VARIANT=$basedir/import/jdks/${i}/${variables["JAVA_HOME_$i"]}
   echo "Using JAVA_HOME_VARIANT: $JAVA_HOME_VARIANT"
   "$JAVA_HOME"/bin/jlink --module-path "${JAVA_HOME_VARIANT}/jmods":"$basedir/target/modules":"$basedir/target/org.getmonero.i2p.zero.jar" --add-modules combined,org.getmonero.i2p.zero --output "$basedir/dist/$i/router" --compress 2 --no-header-files --no-man-pages --order-resources=**/module-info.class,/java.base/java/lang/**,**javafx**
-  "$JAVA_HOME"/bin/jlink --module-path "${JAVA_HOME_VARIANT}/jmods":"$basedir/import/javafx-jmods/$i/javafx-jmods-${JAVAFX_VERSION}":"$basedir/target/modules":"$basedir/target/org.getmonero.i2p.zero.jar":"$basedir/target/org.getmonero.i2p.zero.gui.jar" --add-modules combined,org.getmonero.i2p.zero,org.getmonero.i2p.zero.gui,javafx.controls,javafx.fxml,java.desktop --output "$basedir/dist/$i-gui/router" --compress 2 --no-header-files --no-man-pages --order-resources=**/module-info.class,/java.base/java/lang/**,**javafx**
 done
 
-if [[ "$TARGETS" =~ "mac" ]]; then
-  cp "$basedir/resources/launch-gui.sh" "$basedir/dist/mac-gui/router/bin/"
-fi
-
 for target in ${TARGETS}; do
-  for i in ${target} ${target}-gui; do
-    cp -r "$basedir/import/i2p.base" "$basedir/dist/$i/router/";
-  done
+  cp -r "$basedir/import/i2p.base" "$basedir/dist/$target/router/";
 done
 
 # remove unnecessary native libs from jbigi.jar
@@ -62,50 +39,32 @@ for i in ${TARGETS}; do
       if [ "$j" = "win" ]; then j="windows"; fi
       zip -d "$basedir/dist/$i/router/i2p.base/jbigi.jar" *-${j}-*
       normalizeZip "$basedir/dist/$i/router/i2p.base/jbigi.jar"
-      cp "$basedir/dist/$i/router/i2p.base/jbigi.jar" "$basedir/dist/$i-gui/router/i2p.base/jbigi.jar"
-    fi
+      fi
   done
 done
 
-
-# build mac gui app structure
-if [[ "$TARGETS" =~ "mac" ]]; then
-  mv "$basedir/dist/mac-gui/router" "$basedir/dist/mac-gui/router-tmp"
-  mkdir -p "$basedir/dist/mac-gui/router/i2p-zero.app/Contents/MacOS/"
-  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"
-fi
-
-
-# build linux and linux-gui app structure
+# build linux structure
 if [[ "$TARGETS" =~ "linux" ]]; then
-  for i in linux linux-gui; do
-    mv "$basedir/dist/$i/router" "$basedir/dist/$i/router-tmp"
-    mkdir -p "$basedir/dist/$i/router/bin"
-    mkdir -p "$basedir/dist/$i/router/lib"
-    cp "$basedir/import/jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/jpackageapplauncher" "$basedir/dist/$i/router/bin/i2p-zero"
-    chmod +x "$basedir/dist/$i/router/bin/i2p-zero"
-    mkdir -p "$basedir/dist/$i/router/lib/app"
-    cp "$basedir/resources/i2p-zero.$i.cfg" "$basedir/dist/$i/router/lib/app/i2p-zero.cfg"
-    mv "$basedir/dist/$i/router-tmp" "$basedir/dist/$i/router/lib/runtime"
-    cp "$basedir/import/jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/libapplauncher.so" "$basedir/dist/$i/router/lib/"
-  done
-
-  cp "$basedir/i2p-zero.png" "$basedir/dist/linux-gui/router/lib/"
+  mv "$basedir/dist/linux/router" "$basedir/dist/linux/router-tmp"
+  mkdir -p "$basedir/dist/linux/router/bin"
+  mkdir -p "$basedir/dist/linux/router/lib"
+  cp "$basedir/import/jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/jpackageapplauncher" "$basedir/dist/linux/router/bin/i2p-zero"
+  chmod +x "$basedir/dist/linux/router/bin/i2p-zero"
+  mkdir -p "$basedir/dist/linux/router/lib/app"
+  cp "$basedir/resources/i2p-zero.linux.cfg" "$basedir/dist/linux/router/lib/app/i2p-zero.cfg"
+  mv "$basedir/dist/linux/router-tmp" "$basedir/dist/linux/router/lib/runtime"
+  cp "$basedir/import/jpackage/linux/classes/jdk/incubator/jpackage/internal/resources/libapplauncher.so" "$basedir/dist/linux/router/lib/"
 fi
 
 
-# build win and win-gui app structure
+# build win structure
 if [[ "$TARGETS" =~ "win" ]]; then
-  for i in win win-gui; do
-    mv "$basedir/dist/$i/router" "$basedir/dist/$i/router-tmp"
-    mkdir -p "$basedir/dist/$i/router/app"
-    cp "$basedir/resources/i2p-zero.$i.cfg" "$basedir/dist/$i/router/app/i2p-zero.cfg"
-    mv "$basedir/dist/$i/router-tmp" "$basedir/dist/$i/router/runtime"
-    cp "$basedir/resources/launcher.exe" "$basedir/dist/$i/router/i2p-zero.exe"
-    cp "$basedir/import/jpackage/win/classes/jdk/incubator/jpackage/internal/resources/applauncher.dll" "$basedir/dist/$i/router/"
-  done
+  mv "$basedir/dist/win/router" "$basedir/dist/win/router-tmp"
+  mkdir -p "$basedir/dist/win/router/app"
+  cp "$basedir/resources/i2p-zero.win.cfg" "$basedir/dist/win/router/app/i2p-zero.cfg"
+  mv "$basedir/dist/win/router-tmp" "$basedir/dist/win/router/runtime"
+  cp "$basedir/resources/launcher.exe" "$basedir/dist/win/router/i2p-zero.exe"
+  cp "$basedir/import/jpackage/win/classes/jdk/incubator/jpackage/internal/resources/applauncher.dll" "$basedir/dist/win/router/"
 fi
 
 for i in ${TARGETS}; do
@@ -125,17 +84,3 @@ du -sk "$basedir/dist/"* | awk '{printf "%.1f MB %s\n",$1/1024,$2}'
 echo "*** Done ***"
 echo "To build the distribution archives and show reproducible build SHA-256 hashes, type: bin/zip-all.sh"
 echo ""
-os_name=`uname -s`
-if [ $os_name = Darwin ]; then
-    os_name=mac
-    echo "To run from the command line, type: ./dist/$os_name/router/bin/launch.sh"
-    echo "To run the GUI, double-click: dist/$os_name-gui/router/i2p-zero.app"
-elif [ $os_name = Linux ]; then
-    os_name=linux
-    echo "To run from the command line, type: ./dist/$os_name/router/bin/i2p-zero"
-    echo "To run the GUI, double-click: dist/$os_name-gui/router/i2p-zero"
-else
-    os_name=win
-    echo "To run from the command line, type: ./dist/$os_name/router/i2p-zero.exe"
-    echo "To run the GUI, double-click: dist/$os_name-gui/router/i2p-zero.exe"
-fi

bin/zip-all.sh

@@ -22,7 +22,6 @@ cd "$basedir/dist"
 
 for i in ${TARGETS}; do
   cp -r ${i} "$basedir"/dist-zip-staging/i2p-zero-${i}.v${VERSION}
-  cp -r ${i}-gui "$basedir"/dist-zip-staging/i2p-zero-${i}-gui.v${VERSION}
 done
 
 versionDate=`date -r "$basedir"/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/VERSION +"%Y%m%d%H%M.%S"`
@@ -54,7 +53,6 @@ print4ColsJustified "OS" "Uncompressed size (MB)" "Compressed size (MB)" "v$VERS
 print4ColsJustified "------------------------" "------------------------" "------------------------" "------------------------------------------------------------------"
 for i in ${TARGETS}; do
   print4ColsJustified "${i}"         "`getFileSizeMB $basedir/dist/${i}`"       "`getFileSizeMB $basedir/dist-zip/i2p-zero-${i}.v${VERSION}.zip`"       "\``getHash $basedir/dist-zip/i2p-zero-${i}.v${VERSION}.zip`\`"
-  print4ColsJustified "${i} GUI"         "`getFileSizeMB $basedir/dist/${i}-gui`"       "`getFileSizeMB $basedir/dist-zip/i2p-zero-${i}-gui.v${VERSION}.zip`"       "\``getHash $basedir/dist-zip/i2p-zero-${i}-gui.v${VERSION}.zip`\`"
 done
 
 echo ""