Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (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 '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

File:
1 edited

Legend:

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

    rcbaa62d r2c0e6a3  
    3737    </target>
    3838
    39     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     39    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4040        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    4141            <arg value="list" />
     
    4949            <arg value="," />
    5050        </exec>
     51    </target>
     52
     53    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     54        <!-- set if unset -->
     55        <property name="workspace.changes.tr" value="" />
    5156        <jar destfile="./build/i2psnark.jar" basedir="./build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class">
    5257            <manifest>
     
    6469            <srcfiles dir= "build/obj" includes="**/*.class" excludes="**/I2PSnarkServlet*.class **/messages_*.class" />
    6570        </uptodate>
     71        <condition property="shouldListChanges" >
     72            <and>
     73                <not>
     74                    <isset property="jar.uptodate" />
     75                </not>
     76                <not>
     77                    <isset property="wjar.uptodate" />
     78                </not>
     79                <isset property="mtn.available" />
     80            </and>
     81        </condition>
    6682    </target>   
    6783
     
    7389          <classes dir="./build/obj" includes="**/I2PSnarkServlet*.class" />
    7490     -->
    75     <target name="war" depends="jar, bundle, warUpToDate" unless="war.uptodate" >
     91    <target name="war" depends="jar, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
     92        <!-- set if unset -->
     93        <property name="workspace.changes.tr" value="" />
    7694        <war destfile="../i2psnark.war" webxml="../web.xml" basedir="../" includes="_icons/*" >
    7795          <!-- include only the web stuff, as of 0.7.12 the router will add i2psnark.jar to the classpath for the war -->
Note: See TracChangeset for help on using the changeset viewer.