Changeset 47f0bbb for build.xml


Ignore:
Timestamp:
Jun 13, 2016 6:03:03 AM (4 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
9ba8f53e
Parents:
9a91443 (diff), 2113946 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '65027e70ec9585f6013d97ec88d4f251869e47fd'

and 'c26f9208a0245c8b4b421076479271214ff1d660'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r9a91443 r47f0bbb  
    321321    </target>
    322322
    323     <target name="buildI2PSnark" depends="buildStreaming, buildJetty" >
     323    <target name="buildI2PSnark" depends="buildStreaming, buildJetty, buildSystray" >
    324324        <ant dir="apps/i2psnark/java/" target="war" />
    325325        <copy file="apps/i2psnark/i2psnark.war" todir="build/" />
     
    345345    </target>
    346346
    347     <target name="buildI2PTunnel" depends="buildStreaming, buildJetty" >
     347    <target name="buildI2PTunnel" depends="buildStreaming, buildJetty, buildImagegen" >
    348348        <ant dir="apps/i2ptunnel/java/" target="build" />
    349349        <copy file="apps/i2ptunnel/java/build/i2ptunnel.jar" todir="build/" />
     
    18331833        <copy file="apps/syndie/java/syndie-standalone.zip" todir="." />
    18341834    </target> -->
    1835     <target name="i2psnark" depends="buildProperties" >
     1835
     1836    <!-- standalone i2psnark zip -->
     1837    <target name="i2psnark" depends="buildStreaming, buildJetty, buildSystray" >
    18361838        <ant dir="apps/i2psnark/java" target="standalone" />
    18371839        <copy file="apps/i2psnark/java/i2psnark-standalone.zip" todir="." />
    18381840    </target>
     1841
    18391842    <target name="slackpkg">
    18401843        <ant dir="Slackware/i2p/" target="slackpkg" />
     
    22212224    </target>
    22222225
    2223     <!-- same as debian-tarball but with bundled jetty -->
    2224     <target name="precise-tarball" depends="getExtendedVersion">
     2226    <!-- same as debian-release-tarball but with bundled jetty
     2227      -  We add a 'p' to the release name and tarball since the source package is different;
     2228      -  Launchpad does not allow different source packages with the same name.
     2229      -->
     2230    <target name="precise-release-tarball" depends="getExtendedVersion">
    22252231        <!-- this will use the monotonerc file in the current workspace -->
    22262232        <fail message="This target cannot be used without Monotone! Use &quot;fakeroot debian/rules get-orig-source&quot; instead.">
     
    22312237            </condition>
    22322238        </fail>
    2233         <property name="debian.tarball.name" value="i2p_${Extended.Version}.orig.tar.bz2" />
     2239        <property name="debian.tarball.name" value="i2p_${release.number}p.orig.tar.bz2" />
    22342240        <echo message="Checking out fresh copy into ../i2p-${Extended.Version} for tarballing:" />
    22352241        <delete dir="../i2p-${Extended.Version}" />
     
    22392245            <arg value="-r" />
    22402246            <arg value="w:" />
     2247            <arg value="-b" />
     2248            <arg value="i2p.i2p" />
    22412249            <arg value="../i2p-${Extended.Version}" />
    22422250        </exec>
     
    23192327            <arg value="-r" />
    23202328            <arg value="w:" />
     2329            <arg value="-b" />
     2330            <arg value="i2p.i2p" />
    23212331            <arg value="../i2p-${Extended.Version}" />
    23222332        </exec>
Note: See TracChangeset for help on using the changeset viewer.