Installer: Fix Windows 10 64-bit install for IzPack 4/5 (ticket #1864)

Add more IzPack 5 build targets

build.xml

@@ -24,6 +24,7 @@
         <echo message="  installer-osx: build the GUI installer (OSX only)" />
         <echo message="  installer-windows: build the GUI installer (Windows only)" />
         <echo message="  installer-nowindows: build the GUI installer (all but Windows)" />
+        <echo message="  installer5, installer5-linux, installer5-nowindows, installer5-windows: use IzPack 5" />
         <echo message="  osxLauncher: build the Mac OS X router/GUI launcher (OSX only)" />
         <echo message="  bbLauncher: build the Browser Bundle router launcher" />
         <echo message="  tarball:   tar the full install into i2p.tar.bz2 (extracts to build a new clean install)" />
@@ -79,7 +80,7 @@
             <echo message="  devscripts libjetty9-java libtomcat8-java libtaglibs-standard-jstlel-java libgetopt-java"  />
             <echo message=" " />
             <echo message="The following command will install the additional runtime dependencies:" />
-            <echo message="sudo apt-get install libecj-java geoip-database" />
+            <echo message="sudo apt-get install geoip-database famfamfam-flag-png" />
             <echo message=" " />
             <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
             <echo message="to patch the source and build the packages." />
@@ -1804,22 +1805,36 @@
     </target>
 
     <!-- Custom installers -->
+    <!-- IzPack 4 -->
     <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
         <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
+    <!-- IzPack 5 -->
+    <target name="installer5-nowindows" depends="ensureIzpack5, clean, preppkg-nowindows" >
+        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
+        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
+    </target>
+
 
     <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
         <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
+    <!-- IzPack 4 -->
     <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
         <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     </target>
 
+    <!-- IzPack 5 -->
+    <target name="installer5-linux" depends="ensureIzpack5, clean, preppkg-linux-only" >
+        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
+        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
+    </target>
+
 
     <target name="installer-osx" depends="clean, checkForIzpack2App, preppkg-osx-only, izpack-patches">
         <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />

history.txt

@@ -1,3 +1,8 @@
+2018-07-10 zzz
+ * Installer (ticket #1864):
+   - Fix wrapper selection on Windows 10
+   - Add support for IzPack 5
+
 2018-07-08 zzz
  * i2psnark: Add comment icon (ticket #2278)
  * NTCP2: Avoid possible NPEs (ticket #2286)

installer/install.xml

@@ -102,6 +102,17 @@
         <res id="XInfoPanel.info" src="installer/resources/start-i2p.txt" />
     </resources>
 
+    <dynamicvariables>
+        <variable name="datamodel" value="${SYSTEM_sun_arch_data_model}"/>
+    </dynamicvariables>
+
+    <conditions>
+        <condition type="variable" id="is64bit">
+            <name>datamodel</name>
+            <value>64</value>
+        </condition>
+    </conditions>
+
     <panels>
         <panel classname="HelloPanel"/>
         <panel classname="InfoPanel"/>
@@ -117,7 +128,7 @@
          -->
         <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
         <panel classname="SimpleFinishPanel"/>
-</panels>
+    </panels>
 
     <packs>
         <pack name="Base" required="yes">
@@ -136,13 +147,6 @@
             <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell"> <os family="unix" /> </parsable>
             <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
 
-            <conditions>
-                <condition type="variable" id="is64bit">
-                    <name>SYSTEM_sun_arch_data_model</name>
-                    <value>64</value>
-                </condition>
-            </conditions>
-
             <!-- postinstall stuff for windows -->
             <!-- Wrapper for 32bit Windows JVM -->
             <executable targetfile="$INSTALL_PATH/utility.jar"

installer/install5.xml

@@ -125,9 +125,13 @@ https://izpack.atlassian.net/wiki/spaces/IZPACK/pages/491730/GUI+Preferences
         <variable name="DesktopShortcutCheckboxEnabled" value="true" />
     </variables>
 
+    <dynamicvariables>
+        <variable name="datamodel" value="${SYSTEM[sun.arch.data.model]}"/>
+    </dynamicvariables>
+
     <conditions>
         <condition type="variable" id="is64bit">
-            <name>SYSTEM[sun.arch.data.model]</name>
+            <name>datamodel</name>
             <value>64</value>
         </condition>
     </conditions>

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 = 7;
+    public final static long BUILD = 8;
 
     /** for example "-test" */
     public final static String EXTRA = "";