Changeset 91c9bfe for build.xml


Ignore:
Timestamp:
Dec 24, 2012 7:46:40 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
5dbe629
Parents:
420ccad
Message:

add additional arm types to the 'noExe' condition & add reference the cybergarage javadocs revision in history.txt

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r420ccad r91c9bfe  
    12031203    <target name="installerexe" depends="launch4j">
    12041204        <condition property="noExe">
    1205             <or>
    1206                 <os arch="ppc" />
    1207                 <os arch="armv5tejl" />
    1208             </or>
    1209         </condition>
    1210         <condition property="noExe">
    1211            <not>
    1212             <or>
    1213              <os name="Linux" />
    1214              <os family="windows" />
    1215             </or>
    1216            </not>
    1217         </condition>
    1218         <ant target="doInstallerEXE" />
     1205            <or>
     1206                <os arch="ppc" />
     1207                <os arch="armv5tejl" />
     1208                <os arch="armv6l" />
     1209                <os arch="armv7l" />
     1210            </or>
     1211        </condition>
     1212        <condition property="noExe">
     1213            <not>
     1214                <or>
     1215                    <os name="Linux" />
     1216                    <os family="windows" />
     1217                </or>
     1218            </not>
     1219        </condition>
     1220        <ant target="doInstallerEXE" />
    12191221    </target>
    12201222
     
    12221224    <target name="doInstallerEXE" depends="launch4j" unless="noExe">
    12231225        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    1224         <!-- now the installer exe -->
     1226        <!-- now the installer exe -->
    12251227        <launch4j configFile="./installer/i2pinstaller.xml" />
    1226         <!-- thazzit -->
     1228        <!-- thazzit -->
    12271229    </target>
    12281230
    12291231    <!-- Custom installers -->
    12301232    <target name="installer-nowindows" depends="clean, preppkg-nowindows, izpack-patches" >
    1231         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
     1233        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}.jar" installerType="standard" basedir="${basedir}" />
    12321234    </target>
    12331235
    12341236
    12351237    <target name="installer-freebsd" depends="clean, preppkg-freebsd-only, izpack-patches" >
    1236         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
     1238        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_freebsd-only.jar" installerType="standard" basedir="${basedir}" />
    12371239    </target>
    12381240
    12391241    <target name="installer-linux" depends="clean, preppkg-linux-only, izpack-patches" >
    1240         <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
     1242        <izpack input="${basedir}/installer/install.xml" output="${basedir}/i2pinstall_${full.version}_linux-only.jar" installerType="standard" basedir="${basedir}" />
    12411243    </target>
    12421244
Note: See TracChangeset for help on using the changeset viewer.