Changeset 7527a02 for build.xml


Ignore:
Timestamp:
May 4, 2013 7:00:39 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
b7fca3a
Parents:
5e73408
Message:

build.xml: refactor "noExe check" to remove duplication

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r5e73408 r7527a02  
    251251    </target>
    252252
    253     <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
    254     <target name="buildexe">
    255         <condition property="noExe">
    256             <or>
    257                 <os arch="ppc" />
    258                 <os arch="armv5tejl" />
    259                 <os arch="armv6l" />
    260                 <os arch="armv7l" />
    261             </or>
    262         </condition>
    263         <condition property="noExe">
    264             <not>
     253    <condition property="noExe">
     254        <not>
     255            <!-- We only have launch4j binaries for the following systems -->
     256            <and>
     257                <or>
     258                    <os arch="x86" />
     259                    <os arch="i386" />
     260                    <os arch="i586" />
     261                    <os arch="i686" />
     262                    <os arch="amd64" />
     263                    <os arch="x86_64" />
     264                </or>
    265265                <or>
    266266                    <os name="Linux" />
    267267                    <os family="windows" />
    268268                </or>
    269             </not>
    270         </condition>
    271         <ant target="doBuildEXE" />
     269            </and>
     270        </not>
     271    </condition>
     272
     273    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
     274    <target name="buildexe" depends="buildProperties, launch4j" unless="noExe">
     275        <echo message="See the file &quot;build.properties&quot; if this step fails." />
     276        <jar destfile="./build/launchi2p.jar">
     277            <manifest>
     278                <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
     279                <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-java5-threadpool.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-sslengine.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
     280                <attribute name="Built-By" value="${build.built-by}" />
     281                <attribute name="Build-Date" value="${build.timestamp}" />
     282                <attribute name="Base-Revision" value="${workspace.version}" />
     283            </manifest>
     284        </jar>
     285        <!-- now the standalone launcher exe -->
     286        <launch4j configFile="./installer/i2pstandalone.xml" />
     287        <!-- thazzit -->
    272288    </target>
    273289
     
    277293                 classpath="${basedir}/installer/lib/launch4j/launch4j.jar:${basedir}/installer/lib/launch4j/lib/xstream.jar" />
    278294     </target>
    279 
    280     <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    281     <target name="doBuildEXE" depends="buildProperties, launch4j" unless="noExe">
    282         <echo message="See the file &quot;build.properties&quot; if this step fails." />
    283         <jar destfile="./build/launchi2p.jar">
    284             <manifest>
    285              <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
    286              <attribute name="Class-Path" value="lib/i2p.jar lib/router.jar lib/jbigi.jar lib/BOB.jar lib/sam.jar lib/mstreaming.jar lib/streaming.jar lib/routerconsole.jar lib/i2ptunnel.jar lib/org.mortbay.jetty.jar lib/javax.servlet.jar lib/jasper-compiler.jar lib/jasper-runtime.jar lib/commons-logging.jar lib/commons-el.jar lib/wrapper.jar lib/systray.jar lib/systray4j.jar lib/desktopgui.jar lib/i2psnark.jar lib/jrobin.jar lib/jstl.jar lib/standard.jar lib/jetty-continuation.jar lib/jetty-deploy.jar lib/jetty-http.jar lib/jetty-i2p.jar lib/jetty-io.jar lib/jetty-java5-threadpool.jar lib/jetty-rewrite-handler.jar lib/jetty-security.jar lib/jetty-servlet.jar lib/jetty-servlets.jar lib/jetty-sslengine.jar lib/jetty-start.jar lib/jetty-util.jar lib/jetty-webapp.jar lib/jetty-xml.jar" />
    287              <attribute name="Built-By" value="${build.built-by}" />
    288              <attribute name="Build-Date" value="${build.timestamp}" />
    289              <attribute name="Base-Revision" value="${workspace.version}" />
    290             </manifest>
    291         </jar>
    292         <!-- now the standalone launcher exe -->
    293         <launch4j configFile="./installer/i2pstandalone.xml" />
    294         <!-- thazzit -->
    295     </target>
    296295
    297296    <target name="jar" depends="jarSmall" >
     
    12121211    </target>
    12131212
    1214     <target name="installerexe" depends="launch4j">
    1215         <condition property="noExe">
    1216             <or>
    1217                 <os arch="ppc" />
    1218                 <os arch="armv5tejl" />
    1219                 <os arch="armv6l" />
    1220                 <os arch="armv7l" />
    1221             </or>
    1222         </condition>
    1223         <condition property="noExe">
    1224             <not>
    1225                 <or>
    1226                     <os name="Linux" />
    1227                     <os family="windows" />
    1228                 </or>
    1229             </not>
    1230         </condition>
    1231         <ant target="doInstallerEXE" />
    1232     </target>
    1233 
    12341213    <!-- this makes i2pinstall.exe from install.jar -->
    1235     <target name="doInstallerEXE" depends="launch4j" unless="noExe">
     1214    <target name="installerexe" depends="launch4j" unless="noExe">
    12361215        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    12371216        <!-- now the installer exe -->
Note: See TracChangeset for help on using the changeset viewer.