Changeset 30fc954


Ignore:
Timestamp:
Jul 10, 2018 12:19:29 PM (23 months ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
02669fa
Parents:
307a68aa
Message:

Installer: Fix Windows 10 64-bit install for IzPack? 4/5 (ticket #1864)
Add more IzPack? 5 build targets

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r307a68aa r30fc954  
    2525        <echo message="  installer-windows: build the GUI installer (Windows only)" />
    2626        <echo message="  installer-nowindows: build the GUI installer (all but Windows)" />
     27        <echo message="  installer5, installer5-linux, installer5-nowindows, installer5-windows: use IzPack 5" />
    2728        <echo message="  osxLauncher: build the Mac OS X router/GUI launcher (OSX only)" />
    2829        <echo message="  bbLauncher: build the Browser Bundle router launcher" />
     
    8081            <echo message=" " />
    8182            <echo message="The following command will install the additional runtime dependencies:" />
    82             <echo message="sudo apt-get install libecj-java geoip-database" />
     83            <echo message="sudo apt-get install geoip-database famfamfam-flag-png" />
    8384            <echo message=" " />
    8485            <echo message="Once the dependencies are installed, run &quot;ant debian&quot;"/>
     
    18051806
    18061807    <!-- Custom installers -->
     1808    <!-- IzPack 4 -->
    18071809    <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
    18081810        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
     
    18101812    </target>
    18111813
     1814    <!-- IzPack 5 -->
     1815    <target name="installer5-nowindows" depends="ensureIzpack5, clean, preppkg-nowindows" >
     1816        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
     1817        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     1818    </target>
     1819
    18121820
    18131821    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
     
    18161824    </target>
    18171825
     1826    <!-- IzPack 4 -->
    18181827    <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
    18191828        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
    18201829        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1830    </target>
     1831
     1832    <!-- IzPack 5 -->
     1833    <target name="installer5-linux" depends="ensureIzpack5, clean, preppkg-linux-only" >
     1834        <fixcrlf srcdir="pkg-temp" includes="*.config **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="lf" />
     1835        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    18211836    </target>
    18221837
  • history.txt

    r307a68aa r30fc954  
     12018-07-10 zzz
     2 * Installer (ticket #1864):
     3   - Fix wrapper selection on Windows 10
     4   - Add support for IzPack 5
     5
    162018-07-08 zzz
    27 * i2psnark: Add comment icon (ticket #2278)
  • installer/install.xml

    r307a68aa r30fc954  
    103103    </resources>
    104104
     105    <dynamicvariables>
     106        <variable name="datamodel" value="${SYSTEM_sun_arch_data_model}"/>
     107    </dynamicvariables>
     108
     109    <conditions>
     110        <condition type="variable" id="is64bit">
     111            <name>datamodel</name>
     112            <value>64</value>
     113        </condition>
     114    </conditions>
     115
    105116    <panels>
    106117        <panel classname="HelloPanel"/>
     
    116127         Using the condition this way, the panel is shown on everything *but* Windows.
    117128         -->
    118     <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
    119     <panel classname="SimpleFinishPanel"/>
    120 </panels>
     129        <panel classname="XInfoPanel" condition="!izpack.windowsinstall" />
     130        <panel classname="SimpleFinishPanel"/>
     131    </panels>
    121132
    122133    <packs>
     
    136147            <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell"> <os family="unix" /> </parsable>
    137148            <parsable targetfile="$INSTALL_PATH/Start I2P Router.app/Contents/MacOS/i2prouter" type="shell" os="mac" />
    138 
    139             <conditions>
    140                 <condition type="variable" id="is64bit">
    141                     <name>SYSTEM_sun_arch_data_model</name>
    142                     <value>64</value>
    143                 </condition>
    144             </conditions>
    145149
    146150            <!-- postinstall stuff for windows -->
  • installer/install5.xml

    r307a68aa r30fc954  
    126126    </variables>
    127127
     128    <dynamicvariables>
     129        <variable name="datamodel" value="${SYSTEM[sun.arch.data.model]}"/>
     130    </dynamicvariables>
     131
    128132    <conditions>
    129133        <condition type="variable" id="is64bit">
    130             <name>SYSTEM[sun.arch.data.model]</name>
     134            <name>datamodel</name>
    131135            <value>64</value>
    132136        </condition>
  • router/java/src/net/i2p/router/RouterVersion.java

    r307a68aa r30fc954  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 7;
     21    public final static long BUILD = 8;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.