Changeset 224405d7 for build.xml


Ignore:
Timestamp:
Mar 5, 2012 3:07:04 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
d7c1e97
Parents:
5376858
Message:

Allow EXEs to be built on AMD64

Enabling this should be safe since we will ship separate installers for
Win/non-Win. Those that don't want to build the EXEs can set noEXE in build.properties,
Even better might be to run one of

  • ant installer-freebsd
  • ant installer-linux
  • ant installer-nowindows
  • ant installer-osx
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r5376858 r224405d7  
    213213    <target name="buildexe">
    214214        <condition property="noExe">
    215             <os arch="x86_64" />
    216         </condition>
    217         <condition property="noExe">
    218             <os arch="ppc" />
    219         </condition>
    220         <condition property="noExe">
    221             <os arch="armv5tejl" />
    222         </condition>
    223         <condition property="noExe">
    224             <os arch="amd64" />
     215            <or>
     216                <os arch="ppc" />
     217                <os arch="armv5tejl" />
     218            </or>
    225219        </condition>
    226220        <condition property="noExe">
     
    241235    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    242236    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
     237        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    243238        <jar destfile="./build/launchi2p.jar">
    244239            <manifest>
     
    11931188    <target name="installerexe">
    11941189        <condition property="noExe">
    1195             <os arch="x86_64" />
    1196         </condition>
    1197         <condition property="noExe">
    1198             <os arch="amd64" />
     1190            <or>
     1191                <os arch="ppc" />
     1192                <os arch="armv5tejl" />
     1193            </or>
    11991194        </condition>
    12001195        <condition property="noExe">
     
    12111206    <!-- this makes i2pinstall.exe from install.jar -->
    12121207    <target name="doInstallerEXE" unless="noExe">
     1208        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    12131209        <!-- now the installer exe -->
    12141210        <launch4j configFile="./installer/i2pinstaller.xml" />
Note: See TracChangeset for help on using the changeset viewer.