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/i2ptunnel/java/build.xml

    rcbaa62d r2c0e6a3  
    3535    </target>
    3636
    37     <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
    38       -  This will require sponge to rewrite some seedless stuff that uses it.
    39      -->
    40     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     37    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4138        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
    4239            <arg value="list" />
     
    5047            <arg value="," />
    5148        </exec>
     49    </target>
     50
     51
     52    <!-- TODO: Move the web classes from the jar to the war - they are not part of the API
     53      -  This will require sponge to rewrite some seedless stuff that uses it.
     54     -->
     55    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     56        <!-- set if unset -->
     57        <property name="workspace.changes.j.tr" value="" />
    5258        <jar destfile="./build/i2ptunnel.jar" basedir="./build/obj" includes="**/*.class">
    5359            <manifest>
     
    6571            <srcfiles dir= "build/obj" includes="**/*.class" />
    6672        </uptodate>
     73        <condition property="shouldListChanges" >
     74            <and>
     75                <not>
     76                    <isset property="jar.uptodate" />
     77                </not>
     78                <isset property="mtn.available" />
     79            </and>
     80        </condition>
    6781    </target>
    6882
     
    98112    </target>
    99113
    100     <target name="war" depends="precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     114    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
    101115        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
    102116            <arg value="list" />
     
    110124            <arg value="," />
    111125        </exec>
     126    </target>
     127
     128    <target name="war" depends="precompilejsp, bundle, warUpToDate, listChangedFiles2" unless="war.uptodate" >
     129        <!-- set if unset -->
     130        <property name="workspace.changes.w.tr" value="" />
    112131        <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
    113132             basedir="../jsp/" excludes="web.xml, web-fragment.xml, web-out.xml, **/*.java, *.jsp">
     
    124143            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, **/*.java, *.jsp" />
    125144        </uptodate>
     145        <condition property="shouldListChanges2" >
     146            <and>
     147                <not>
     148                    <isset property="war.uptodate" />
     149                </not>
     150                <isset property="mtn.available" />
     151            </and>
     152        </condition>
    126153    </target>
    127154
Note: See TracChangeset for help on using the changeset viewer.