Changeset 307a68aa


Ignore:
Timestamp:
Jul 10, 2018 11:19:41 AM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
30fc954
Parents:
2664c41
Message:

Installer: Add support for IzPack? 5 (ticket #1864)
fix typo in postinstall.sh

Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • build.properties

    r2664c41 r307a68aa  
    3131# Building EXEs in x64 Linux requires that 32bit libraries are installed. In Debian,
    3232# for example, installing the libc6-i386 package will satisfy this requirement.
    33 
    3433# Uncomment the next line to prevent building EXEs (changing it to false will have no impact)
    3534#noExe=true
     35
     36# IzPack 5.1.x install dir
     37#izpack5.home=/PATH/TO/IzPack
    3638
    3739# Change this to false if you don't have gettext or you want to prevent it from running during the build

  • build.xml

    r2664c41 r307a68aa  
    17631763    </target>
    17641764
     1765    <!-- IzPack 4 -->
    17651766    <target name="installer" depends="preppkg, buildProperties, util-list-changes, izpack-patches, buildUtilityJar" >
    1766         <!--
    1767           Force 1.5 pack200 output
    1768           Doesnt work!
    1769           http://jira.codehaus.org/browse/IZPACK-404
    1770           http://forums.sun.com/thread.jspa?threadID=773439
    1771           http://bfo.co.uk/blog/2010/05/13/combining_ant_jar_signatures_and_pack200.html
    1772         <property name="com.sun.java.util.jar.pack.package.majver" value="150" />
    1773         <property name="com.sun.java.util.jar.pack.package.minver" value="7" />
    1774         -->
    17751767        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    1776 
     1768        <ant target="installerexe" />
     1769    </target>
     1770
     1771    <!-- IzPack 5 -->
     1772    <target name="ensureIzpack5" >
     1773        <!-- set if unset -->
     1774        <property name="izpack5.home" value="${user.home}/IzPack" />
     1775        <condition property="izpack5.available" >
     1776            <available file="${izpack5.home}" type="dir" />
     1777        </condition>
     1778        <fail message="Error - IzPack 5.1.x must be installed at ${izpack5.home}, or set izpack5.home=/PATH/TO/IzPack in override.properties, or download from http://izpack.org/downloads/ and install" >
     1779            <condition>
     1780                <not>
     1781                    <isset property="izpack5.available" />
     1782                </not>
     1783            </condition>
     1784        </fail>
     1785        <path id="izpack5.lib.path">
     1786            <fileset dir="${izpack5.home}/lib" includes="*.jar"/>
     1787        </path>
     1788        <taskdef name="izpack5"
     1789                 classpathref="izpack5.lib.path"
     1790                 classname="com.izforge.izpack.ant.IzPackTask" />
     1791    </target>
     1792
     1793    <target name="installer5" depends="ensureIzpack5, preppkg, buildProperties, util-list-changes, buildUtilityJar" >
     1794        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    17771795        <ant target="installerexe" />
    17781796    </target>
    … …  
    18461864    </target>
    18471865
     1866    <!-- IzPack 4 -->
    18481867    <target name="installer-windows" depends="clean, preppkg-windows-only, util-list-changes, izpack-patches, buildUtilityJar" >
    18491868        <fixcrlf srcdir="pkg-temp" includes="*.config *.bat *.cmd **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="crlf"/>
    18501869        <izpack input="${basedir}/installer/install.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
     1870        <ant target="installerexe" />
     1871        <delete file="${basedir}/install.jar" />
     1872        <move file="${basedir}/i2pinstall.exe" tofile="${basedir}/i2pinstall_${full.version}_windows.exe" />
     1873    </target>
     1874
     1875    <!-- IzPack 5 -->
     1876    <target name="installer5-windows" depends="ensureIzpack5, clean, preppkg-windows-only, util-list-changes, buildUtilityJar" >
     1877        <fixcrlf srcdir="pkg-temp" includes="*.config *.bat *.cmd **/*.xml **/*.properties **/*.txt scripts/*" encoding="utf8" eol="crlf"/>
     1878        <izpack5 input="${basedir}/installer/install5.xml" output="${basedir}/install.jar" installerType="standard" basedir="${basedir}" />
    18511879        <ant target="installerexe" />
    18521880        <delete file="${basedir}/install.jar" />

  • installer/resources/checklist.md

    r2664c41 r307a68aa  
    107107  - `history.txt`
    108108  - `installer/install.xml`
     109  - `installer/install5.xml`
    109110  - `core/java/src/net/i2p/CoreVersion.java`
    110111  - `router/java/src/net/i2p/router/RouterVersion.java`

  • installer/resources/postinstall.sh

    r2664c41 r307a68aa  
    105105chmod 755 ./eepget
    106106rm -rf ./icons ./lib/wrapper
    107 rm -f ./lib/*.dll /*.bat ./*.cmd ./*.exe ./utility.jar
     107rm -f ./lib/*.dll ./*.bat ./*.cmd ./*.exe ./utility.jar
    108108
    109109if [ ! `echo $HOST_OS  |grep osx` ]; then
Note: See TracChangeset for help on using the changeset viewer.