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

    rcbaa62d r2c0e6a3  
    2424    </target>
    2525
    26     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate">
     26    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    2727        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    2828            <arg value="list" />
     
    3636            <arg value="," />
    3737        </exec>
     38    </target>
     39
     40    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate">
     41        <!-- set if unset -->
     42        <property name="workspace.changes.tr" value="" />
    3843        <jar destfile="./build/systray.jar" basedir="./build/obj" includes="**/*.class">
    3944            <manifest>
     
    5156            <srcfiles dir= "build/obj" includes="**/*.class" />
    5257        </uptodate>
     58        <condition property="shouldListChanges" >
     59            <and>
     60                <not>
     61                    <isset property="jar.uptodate" />
     62                </not>
     63                <isset property="mtn.available" />
     64            </and>
     65        </condition>
    5366    </target>
    5467
Note: See TracChangeset for help on using the changeset viewer.