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

    rcbaa62d r2c0e6a3  
    4646    </target>
    4747
    48     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     48    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4949        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    5050            <arg value="list" />
     
    5858            <arg value="," />
    5959        </exec>
     60    </target>
     61
     62    <target name="jar" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     63        <!-- set if unset -->
     64        <property name="workspace.changes.tr" value="" />
    6065        <jar destfile="./build/sam.jar" basedir="./build/obj" includes="**/*.class">
    6166            <manifest>
     
    7378            <srcfiles dir= "build/obj" includes="**/*.class" />
    7479        </uptodate>
     80        <condition property="shouldListChanges" >
     81            <and>
     82                <not>
     83                    <isset property="jar.uptodate" />
     84                </not>
     85                <isset property="mtn.available" />
     86            </and>
     87        </condition>
    7588    </target>
    7689
Note: See TracChangeset for help on using the changeset viewer.