Ignore:
Timestamp:
Mar 8, 2011 1:31:57 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
21dbee0
Parents:
f11a543 (diff), b02fe53 (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:

propagate from branch 'i2p.i2p.zzz.test4' (head 7b50b6c3d48da68078a86a53e55e2c18f55685e8)

to branch 'i2p.i2p' (head ebce577e19b70c281daacc5277f98e9bb2bb9630)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/ministreaming/java/build.xml

    rf11a543 rf4ca3976  
    2525        <mkdir dir="./build/obj" />
    2626        <!-- half of this is deprecated classes so turn deprecation off -->
    27         <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
     27        <javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5"
     28               includeAntRuntime="false"
     29               destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
    2830            <compilerarg line="${javac.compilerargs}" />
    2931        </javac>
    3032    </target>
    31     <target name="jar" depends="compile">
    32         <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" />
     33
     34    <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     35        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
     36            <arg value="list" />
     37            <arg value="changed" />
     38            <arg value="." />
     39        </exec>
     40        <!-- \n in an attribute value generates an invalid manifest -->
     41        <exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
     42            <arg value="-s" />
     43            <arg value="[:space:]" />
     44            <arg value="," />
     45        </exec>
     46        <jar destfile="./build/mstreaming.jar" basedir="./build/obj" includes="**/*.class" >
     47            <manifest>
     48                <attribute name="Build-Date" value="${build.timestamp}" />
     49                <attribute name="Base-Revision" value="${workspace.version}" />
     50                <attribute name="Workspace-Changes" value="${workspace.changes.tr}" />
     51            </manifest>
     52        </jar>
    3353    </target>
     54
     55    <target name="jarUpToDate">
     56        <uptodate property="jar.uptodate" targetfile="build/mstreaming.jar" >
     57            <srcfiles dir= "." includes="build/obj/**/*.class" />
     58        </uptodate>
     59    </target>
     60
    3461    <target name="javadoc">
    3562        <mkdir dir="./build" />
Note: See TracChangeset for help on using the changeset viewer.