Changeset 4407373 for build.xml


Ignore:
Timestamp:
Jun 28, 2014 4:51:38 PM (6 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
ce2694e
Parents:
fef59141
Message:

build.xml: copy built binaries to build/ in the build* targets

This will hopefully make it easier for apps to use bits of I2P as build-deps.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rfef59141 r4407373  
    140140    <target name="buildBOB" depends="buildStreaming" >
    141141        <ant dir="apps/BOB/" target="jar" />
     142        <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
    142143    </target>
    143144
    144145    <target name="buildSAM" depends="buildStreaming" >
    145146        <ant dir="apps/sam/java/" target="jar" />
     147        <copy file="apps/sam/java/build/sam.jar" todir="build/" />
    146148    </target>
    147149
    148150    <target name="buildSusiMail" depends="buildCore, buildJetty" >
    149151        <ant dir="apps/susimail/" target="war" />
     152        <copy file="apps/susimail/susimail.war" todir="build/" />
    150153    </target>
    151154
    152155    <target name="buildSusiDNS" depends="buildCore, buildJetty" >
    153156        <ant dir="apps/susidns/src" target="all" />
     157        <copy file="apps/susidns/src/susidns.war" todir="build/" />
    154158    </target>
    155159
    156160    <target name="buildI2PSnark" depends="buildStreaming, buildJetty" >
    157161        <ant dir="apps/i2psnark/java/" target="war" />
     162        <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
     163        <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
    158164    </target>
    159165
     
    165171    <target name="buildAddressbook" depends="buildCore, buildJetty" >
    166172        <ant dir="apps/addressbook/" target="war" />
     173        <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    167174    </target>
    168175
     
    170177    <target name="buildI2PTunnelJar" depends="buildStreaming" >
    171178        <ant dir="apps/i2ptunnel/java/" target="jar" />
     179        <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
    172180    </target>
    173181
    174182    <target name="buildI2PTunnel" depends="buildStreaming, buildJetty" >
    175183        <ant dir="apps/i2ptunnel/java/" target="build" />
     184        <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
     185        <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
    176186    </target>
    177187
     
    181191-->
    182192        <ant dir="apps/desktopgui" target="jar" />
     193        <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    183194    </target>
    184195
     
    189200    <target name="buildJetty" depends="buildCore" >
    190201        <ant dir="apps/jetty" target="build" />
     202        <copy todir="build/" >
     203            <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
     204        </copy>
    191205    </target>
    192206
    193207    <target name="buildSystray" depends="buildCore" >
    194208        <ant dir="apps/systray/java/" target="jar" />
     209        <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    195210    </target>
    196211
    197212    <target name="buildStreaming" depends="buildMinistreaming" >
    198213        <ant dir="apps/streaming/java/" target="jar" />
     214        <copy file="apps/streaming/java/build/streaming.jar" todir="build/" />
    199215    </target>
    200216
    201217    <target name="buildMinistreaming" depends="buildCore" >
    202218        <ant dir="apps/ministreaming/java/" target="jar" />
     219        <copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
    203220    </target>
    204221
     
    223240                <attribute name="Build-Date" value="${build.timestamp}" />
    224241                <attribute name="Base-Revision" value="${workspace.version}" />
    225             </manifest>
     242            </manifest>
    226243        </jar>
    227244    </target>
     245
     246    <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber" >
     247        <!-- default if not set above -->
     248        <property name="workspace.version" value="unknown" />
     249        <tstamp>
     250            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
     251        </tstamp>
     252        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
     253        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
     254    </target>
     255
     256    <target name="buildWEB" depends="buildRouterConsole" >
     257        <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
     258        <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
     259    </target>
     260
     261    <!-- end of sub-build.xml targets -->
    228262
    229263    <target name="checkForMtn" >
     
    282316        <replaceregexp byline="true" file="router/java/src/net/i2p/router/RouterVersion.java"
    283317            match='(^\s+public\s+final\s+static\s+long\s+BUILD\s+=\s+)[0-9]+;' replace='\1${new.i2p.build.number};'/>
    284     </target>
    285 
    286     <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber" >
    287         <!-- default if not set above -->
    288         <property name="workspace.version" value="unknown" />
    289         <tstamp>
    290             <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    291         </tstamp>
    292         <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    293         <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    294     </target>
    295 
    296     <!-- end of sub-build.xml targets -->
    297 
    298     <target name="buildWEB" depends="buildRouterConsole" >
    299         <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
    300         <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
    301         <copy todir="build/" >
    302             <fileset dir="apps/jetty/jettylib" excludes="ant.jar" />
    303         </copy>
    304318    </target>
    305319
     
    347361     </target>
    348362
    349     <target name="jar" depends="jarSmall" >
    350         <copy file="apps/BOB/dist/BOB.jar" todir="build/" />
    351         <copy file="apps/sam/java/build/sam.jar" todir="build/" />
    352         <copy file="apps/susimail/susimail.war" todir="build/" />
    353         <copy file="apps/susidns/src/susidns.war" todir="build/" />
    354         <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
    355         <copy file="apps/i2psnark/java/build/i2psnark.jar" todir="build/" />
    356 
    357     </target>
    358     <target name="jarSmall" depends="builddepSmall, buildJrobin" >
    359         <copy file="core/java/build/i2p.jar" todir="build/" />
    360         <copy file="router/java/build/router.jar" todir="build/" />
    361         <copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
    362         <copy file="apps/streaming/java/build/streaming.jar" todir="build/" />
    363         <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
    364         <copy file="apps/i2ptunnel/java/build/i2ptunnel.war" todir="build/" />
    365         <copy file="apps/systray/java/build/systray.jar" todir="build/" />
    366         <copy file="apps/desktopgui/dist/desktopgui.jar" todir="build/" />
    367         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
    368     </target>
     363     <!--
     364          the files are now copied to the build directory
     365          in the build* targets
     366      -->
     367     <target name="jar" depends="jarSmall" />
     368     <target name="jarSmall" depends="builddepSmall, buildJrobin" />
    369369
    370370    <!-- Custom target to collect the jars that I2P-Bote needs to compile, so it can compile from source. -->
    371     <!-- TODO eww, we should not need to do this -->
    372371    <target name="jarBote" depends="buildRouter, buildStreaming, buildJetty" >
    373         <copy file="core/java/build/i2p.jar" todir="build/" />
    374         <copy file="router/java/build/router.jar" todir="build/" />
    375         <copy file="apps/ministreaming/java/build/mstreaming.jar" todir="build/" />
    376         <copy file="apps/streaming/java/build/streaming.jar" todir="build/" />
    377         <copy file="apps/jetty/jettylib/org.mortbay.jetty.jar" todir="build/" />
    378         <copy file="apps/jetty/jettylib/jasper-compiler.jar" todir="build/" />
    379         <copy file="apps/jetty/jettylib/jasper-runtime.jar" todir="build/" />
    380         <copy file="apps/jetty/jettylib/javax.servlet.jar" todir="build/" />
    381         <copy file="apps/jetty/jettylib/commons-logging.jar" todir="build/" />
    382         <copy file="apps/jetty/jettylib/commons-el.jar" todir="build/" />
    383372        <copy file="apps/susidns/src/WEB-INF/lib/jstl.jar" todir="build/" />
    384373        <copy file="apps/susidns/src/WEB-INF/lib/standard.jar" todir="build/" />
Note: See TracChangeset for help on using the changeset viewer.