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

    rcbaa62d r2c0e6a3  
    4545    </target>
    4646
    47     <target name="jar" depends="builddep, compile, jarUpToDate" unless="jar.uptodate" >
     47    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    4848        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    4949            <arg value="list" />
     
    5757            <arg value="," />
    5858        </exec>
     59    </target>
     60
     61    <target name="jar" depends="builddep, compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     62        <!-- set if unset -->
     63        <property name="workspace.changes.tr" value="" />
    5964        <jar destfile="./build/streaming.jar" basedir="./build/obj" includes="**/*.class" >
    6065            <manifest>
     
    7075            <srcfiles dir= "." includes="build/obj/**/*.class" />
    7176        </uptodate>
     77        <condition property="shouldListChanges" >
     78            <and>
     79                <not>
     80                    <isset property="jar.uptodate" />
     81                </not>
     82                <isset property="mtn.available" />
     83            </and>
     84        </condition>
    7285    </target>
    7386
Note: See TracChangeset for help on using the changeset viewer.