update release notes

buildscripts/launcher.sh

@@ -58,14 +58,20 @@ if [ -z "$EXTRA" ]; then
 fi
 if [ "$VERSION" = master ]; then
   VERSIONDATE="$(date +%m%d)"
+  export TAG_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+else
+  export TAG_VERSION="$VERSION"
 fi
+
+
+
 find . -name RouterVersion.java -exec sed -i "s|$OLDEXTRA|$EXTRA|g" {} \;
 git switch - || :
 git pull --tags
-git checkout -b "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || :
-git commit -am "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || :
-git archive --format=tar.gz --output="$SCRIPT_DIR/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "i2p-$VERSION$VERSIONDATE-$EXTRACODE"
-git checkout "i2p-$VERSION$VERSIONDATE-$EXTRACODE" || :
+git checkout -b "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
+git commit -am "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
+git archive --format=tar.gz --output="$SCRIPT_DIR/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE"
+git checkout "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
 
 for i in $COUNT; do
   echo -n "$i...."; sleep 1s

buildscripts/news.sh

@@ -38,7 +38,8 @@ echo "$I2P_VERSION"
 export SUMMARY_HERE=$(head -n 1 "$SCRIPT_DIR/docs/RELEASE.md" | sed "s|# ||g")
 echo "$SUMMARY_HERE"
 export CONTENT_HERE=$(tail -n +2 "$SCRIPT_DIR/docs/RELEASE.md" | markdown)
-echo "$CONTENT_HERE"
+echo "$CONTENT_HERE" > news-content.html
+unset CONTENT_HERE
 ./create_new_entry.sh
 
 export DATE=$(date +%Y-%m-%d)
@@ -62,4 +63,5 @@ TORRENTJSON+='    }'
 TORRENTJSON+='  }'
 TORRENTJSON+=']'
 
-echo "$TORRENTJSON" | jq
+echo "$TORRENTJSON" | jq > "$I2P_NEWSXML/data/win/beta/releases.json"
+echo "$TORRENTJSON" | jq > "$I2P_NEWSXML/data/win/testing/releases.json"

buildscripts/release-torrent.sh

@@ -27,6 +27,10 @@ if [ -f ./i2pversion_override ]; then
   . ./i2pversion_override
 fi
 
+if [ ! -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" ]; then
+	wget -c "https://github.com/eyedeekay/i2p.firefox/releases/download/i2p-firefox-$I2P_VERSION/I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+fi
+
 cp -v "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 java -cp "$I2P_LIBS/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 "$HOME/.i2p-plugin-keys/news-su3-keystore.ks" $I2P_VERSION $SIGNER
 rm -f i2pwinupdate.su3.torrent
@@ -37,8 +41,8 @@ echo "~~~~~~~~~~"
 MAGNET=$(transmission-show -m "i2pwinupdate.su3.torrent" 2>&1 3>&1 | tail -n 1)
 echo "$MAGNET"
 ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
 ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"

docs/RELEASE.md

@@ -1,6 +1,13 @@
-# I2P Easy-Install Bundle for Windows 2.4.9
+# I2P Easy-Install Bundle for Windows 2.4.91
 
 This is a pre-release of the I2P Easy-Install Bundle for Windows.
+
+This release embeds a "trunk" Java I2P router based on the git `master` branch.
+Network behavior is close to the 2.5.0 release.
+It is not an automatic update.
+
+## 2.4.9 Release Notes.
+
 This changes how the I2P bundle and browser profile manager are installed and integrated with the host system.
 The Easy-Install bundle is now a "portable" system that can be moved to different locations within or between Windows file-systems while retaining all built-in functionality.
 A shortcut for starting the I2P router is still provided by the installer for convenience, but the shortcuts for starting the I2P Browser are now integrated with the I2P desktop UI.
@@ -28,6 +35,3 @@ For you the end user, nothing much should change.
 You'll get your updates a lot faster, and have more options available for testing.
 The same installer is used for the updater, and the process is handled the same way.
 However for developers, testers, and maintainers, this release will result in big changes for the better.
-
-This release still embeds a `2.4.0` Java I2P router. No changes have been made to update the embedded router.
-Network behavior will be unchanged until the official `2.5.0` release.

i2pversion

@@ -2,8 +2,8 @@
 
 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.4.991
-export I2PFIREFOX_VERSION=1.4.991
+I2PFIREFOX_VERSION=1.5.0
+export I2PFIREFOX_VERSION=1.5.0
 
 export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-])
 VERSIONMAJOR=$(echo "$GITHUB_TAG" | cut -d . -f 1)
@@ -22,5 +22,7 @@ I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
-VERSION=i2p-2.4.0
-export VERSION=i2p-2.4.0
+#VERSION=i2p-2.4.0
+#export VERSION=i2p-2.4.0
+VERSION=master
+export VERSION=master