app-content not resource-dir

changelog.txt

@@ -1,3 +1,8 @@
+2022-09-08 idk
+ * Generate a source tarball when we checkout a branch of i2p.i2p
+ * Upload a source tarball when we do a daily build
+ * Clean up a source tarball when running the clean script. Regenerate tarball after cleaning.
+
 2022-09-06 idk
  * Point release 1.9.5, fixes a bug which occurs more often on Windows 11, fixes a SusiDNS issue
 

clean.sh

@@ -4,6 +4,7 @@ SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
 cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
+. "$SCRIPT_DIR/i2pversion"
 
 if [ -f config_overide.sh ]; then
   . "$SCRIPT_DIR/config_override.sh"
@@ -11,8 +12,9 @@ fi
 
 cd ../i2p.i2p.jpackage-build/
 ant distclean
+git clean -fd
 git checkout .
-git checkout master
+tar --exclude="$SCRIPT_DIR/../i2p.i2p.jpackage-build/.git" -cvzf "$SCRIPT_DIR/../i2p.i2p.jpackage-build.tar.gz" "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
 cd "$SCRIPT_DIR" || exit 1
 rm -rf \
 	build \
@@ -28,6 +30,5 @@ rm -rf \
 	wrapper.log \
 	*.jar \
 	*.exe \
-	*.dmg \
-	*.tar.gz
+	*.dmg
 make clean

exe.sh

@@ -0,0 +1,40 @@
+#! /usr/bin/env sh
+
+## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
+
+# Motivation
+
+. ./config.sh
+. ./i2pversion
+jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
+    --verbose \
+    --java-options "-Xmx512m" \
+    --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+    --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
+    $JPACKAGE_OPTS \
+    --app-content build/I2P/config/certificates \
+    --app-content build/I2P/config/eepsite \
+    --app-content build/I2P/config/geoip \
+    --app-content build/I2P/config/webapps \
+    --app-content build/I2P/config/clients.config \
+    --app-content build/I2P/config/hosts.txt \
+    --app-content build/I2P/config/i2ptunnel.config \
+    --app-content build/I2P/config/jpackaged \
+    --app-content build/I2P/config/router.config \
+    --app-content build/I2P/config/wrappper.config \
+    --input build \
+    --verbose \
+    --type exe \
+    --win-dir-chooser \
+    --win-help-url "https://geti2p.net" \
+    --win-menu \
+    --win-menu-group "I2P Easy-Install Bundle" \
+    --win-shortcut \
+    --win-shortcut-prompt \
+    --win-per-user-install \
+    --license-file LICENSE.md \
+    --main-jar launcher.jar \
+    --main-class net.i2p.router.WinLauncher

msi.sh

@@ -2,9 +2,11 @@
 
 ## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
 
+# Motivation
+
 . ./config.sh
 . ./i2pversion
-jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
+jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
@@ -13,7 +15,16 @@ jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --resource-dir build \
+    --app-content build/I2P/config/certificates \
+    --app-content build/I2P/config/eepsite \
+    --app-content build/I2P/config/geoip \
+    --app-content build/I2P/config/webapps \
+    --app-content build/I2P/config/clients.config \
+    --app-content build/I2P/config/hosts.txt \
+    --app-content build/I2P/config/i2ptunnel.config \
+    --app-content build/I2P/config/jpackaged \
+    --app-content build/I2P/config/router.config \
+    --app-content build/I2P/config/wrappper.config \
     --input build \
     --verbose \
     --type msi \

sign.sh

@@ -40,6 +40,6 @@ if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     linuxsign I2P-Profile-Installer-$I2P_VERSION.exe
     cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
 else
-    signtool.exe sign /a "I2P-Profile-Installer-$I2P_VERSION.exe"
+    signtool.exe sign -a "I2P-Profile-Installer-$I2P_VERSION.exe"
     cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
 fi