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

Add more IzPack 5 build targets

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"/>
@@ -115,9 +126,9 @@
         <!--
          Using the condition this way, the panel is shown on everything *but* Windows.
          -->
-    <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
-    <panel classname="SimpleFinishPanel"/>
-</panels>
+        <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
+        <panel classname="SimpleFinishPanel"/>
+    </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"