Build: Add non-pack200 release targets (ticket #2693)

Update: Don't require pack200 for in-net update (ticket #2693)

apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java

@@ -240,12 +240,14 @@ class NewsFetcher extends UpdateRunner {
                                 _mgr.notifyVersionConstraint(this, _currentURI, ROUTER_SIGNED, "", ver, msg);
                                 return;
                             }
+/*
                             if (!FileUtil.isPack200Supported()) {
                                 String msg = _mgr._t("No Pack200 support in Java runtime.");
                                 _log.logAlways(Log.WARN, "Cannot update to version " + ver + ": " + msg);
                                 _mgr.notifyVersionConstraint(this, _currentURI, ROUTER_SIGNED, "", ver, msg);
                                 return;
                             }
+*/
                             if (!ConfigUpdateHandler.USE_SU3_UPDATE) {
                                 String msg = _mgr._t("No update certificates installed.");
                                 _log.logAlways(Log.WARN, "Cannot update to version " + ver + ": " + msg);

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

@@ -85,6 +85,8 @@ public class ConfigUpdateHandler extends FormHandler {
      *  Changed as of release 0.8 to support both .sud and .su2
      *  Some JVMs (IcedTea) don't have pack200
      *  Update hosts must maintain both
+     *
+     *  These versions have not been released since 0.9.22, 2015.
      */
     private static final String PACK200_URLS =
     "http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
@@ -121,13 +123,13 @@ public class ConfigUpdateHandler extends FormHandler {
     private static final String SU3_CERT_DIR = "certificates/router";
 
     /**
-     *  Only enabled if we have pack200 and trusted public key certificates installed
+     *  Only enabled if we have trusted public key certificates installed
      *  @since 0.9.9
      */
     public static final boolean USE_SU3_UPDATE;
     static {
         String[] files = (new File(I2PAppContext.getGlobalContext().getBaseDir(), SU3_CERT_DIR)).list();
-        USE_SU3_UPDATE = FileUtil.isPack200Supported() && files != null && files.length > 0;
+        USE_SU3_UPDATE = files != null && files.length > 0;
     }
 
     private static final String DEFAULT_SU3_UPDATE_URLS =

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -345,8 +345,9 @@ public class RouterConsoleRunner implements RouterApp {
     /** @since 0.9.17 */
     private void checkJavaVersion() {
         boolean noJava8 = !SystemVersion.isJava8();
-        boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
+        //boolean noPack200 = (PluginStarter.pluginsEnabled(_context) || !NewsHelper.isUpdateDisabled(_context)) &&
-                            !FileUtil.isPack200Supported();
+        //                    !FileUtil.isPack200Supported();
+        boolean noPack200 = false;
         boolean openARM = SystemVersion.isARM() && SystemVersion.isOpenJDK() && !SystemVersion.isJava9();
         boolean isZero = SystemVersion.isZeroVM();
         boolean isJava11 = false; // SystemVersion.isJava11();

build.xml

@@ -1569,6 +1569,8 @@
     <target name="updater200WithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, pack200, zipit200" />
     <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
     <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
+    <target name="updaterWithJettyAndGeoIP" depends="prepjupdate, prepgeoupdate, preplicenses, zipit" />
+    <target name="updaterWithJettyAndJbigi" depends="prepjupdate, prepjbigiupdate, preplicenses, zipit" />
     <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" />
     <target name="updaterWithJettyAndJbigiRepack" depends="prepjupdate, prepjbigiupdate, preplicenses, repack200, zipit" />
     <target name="updaterWithJettyAndGeoIPRepack" depends="prepjupdate, prepgeoupdate, preplicenses, repack200, zipit" />
@@ -2178,11 +2180,19 @@
     <!-- this is the same dependency as pkg, but with updater200 in the middle,
          since preppkg puts too much stuff in pkg-temp -->
 
-    <!-- Release targets - pick one: with Jbigi, GeoIP, or neither -->
+    <!-- Release targets - pick one: with Jbigi, GeoIP, or neither; pack200, repack, or not -->
 
-    <target name="release"          depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="release"          depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJetty, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
-    <target name="releaseWithJbigi" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithJbigi" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigi, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
-    <target name="releaseWithGeoIP" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithGeoIP" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIP, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+
+    <target name="releaseRepack"          depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithJbigiRepack" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithGeoIPRepack" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+
+    <target name="release200"          depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyRepack, updater200WithJetty, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithJbigi200" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndJbigiRepack, updater200WithJettyAndJbigi, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
+    <target name="releaseWithGeoIP200" depends="verifyReleaseBuildNumbers, -pre-release, distclean, testscripts, updaterWithJettyAndGeoIPRepack, updater200WithJettyAndGeoIP, delete-j6-update, installer5-nowindows, delete-nonwindows, installer5-windows, -releaseit" />
 
     <target name="-releaseit">
         <echo message="New version number is ${release.number}" />

history.txt

@@ -1,4 +1,22 @@
+2020-02-20 zzz
+ * Build: Add non-pack200 release targets (ticket #2693)
+ * GeoIP (ticket #2692):
+   - Add unknown and Kosovo country codes for db-ip.com
+   - Change GeoIP update script to use db-ip.com
+   - Prefer more recent of mmdb or Debian files if we have both
+ * Update: Don't require pack200 for in-net update (ticket #2693)
+
+2020-02-18 zzz
+ * Util: Improve LookupDest CLI, add to CommandLine
+
+2020-02-17 zzz
+ * Debian: Remove GzipFilter in base-context.xml,
+   does nothing with Jetty 9.4 (ticket #2599)
+ * Install: Remove commented-out GzipFilter in cgi-context.xml
+ * i2psnark: Revert API changes that broke i2psnark-rpc plugin
+
 2020-02-15 zzz
+ * Console: Fix jump-to-section on /stats
  * NTCP: Remove closed connections from write queue (ticket #2686)
 
 2020-02-12 zzz

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 8;
+    public final static long BUILD = 9;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";