Changeset c5f04ee for build.xml


Ignore:
Timestamp:
Jun 8, 2011 8:15:53 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3d18255e
Parents:
d57925e8
Message:
  • Don't do 'mtn list changed' if not in a workspace or not needed
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rd57925e8 rc5f04ee  
    160160    </target>
    161161
    162     <target name="buildProperties" >
     162    <target name="checkForMtn" >
     163        <available property="mtn.available" file="_MTN" type="dir" />
     164    </target>
     165
     166    <target name="getMtnRev" depends="checkForMtn" if="mtn.available" >
    163167        <exec executable="mtn" outputproperty="workspace.version" errorproperty="mtn.error1" failifexecutionfails="false" >
    164168            <arg value="automate" />
    165169            <arg value="get_base_revision_id" />
    166170        </exec>
     171    </target>
     172
     173    <target name="buildProperties" depends="getMtnRev" >
     174        <!-- default if not set above -->
     175        <property name="workspace.version" value="unknown" />
    167176        <tstamp>
    168177            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
     
    241250    </target>
    242251
    243     <target name="jbigi-list-changes">
     252    <target name="jbigi-list-changes" depends="checkForMtn" if="mtn.available" >
    244253        <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
    245254            <arg value="list" />
     
    256265
    257266    <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
     267        <!-- set if unset -->
     268        <property name="workspace.changes.jbigi.tr" value="" />
    258269        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    259270            <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
     
    267278
    268279    <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
     280        <!-- set if unset -->
     281        <property name="workspace.changes.jbigi.tr" value="" />
    269282        <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
    270283            <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
     
    278291
    279292    <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
     293        <!-- set if unset -->
     294        <property name="workspace.changes.jbigi.tr" value="" />
    280295        <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
    281296            <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
     
    784799        <copy file="build/org.mortbay.jetty.jar" todir="pkg-temp/lib/" />
    785800    </target>
    786     <target name="installer" depends="preppkg, buildProperties">
    787         <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
    788         <mkdir dir="pkg-temp/installer" />
     801
     802    <target name="util-list-changes" depends="checkForMtn" if="mtn.available" >
    789803        <exec executable="mtn" outputproperty="workspace.changes.util" errorproperty="mtn.error.util" failifexecutionfails="false" >
    790804            <arg value="list" />
     
    798812            <arg value="," />
    799813        </exec>
     814    </target>
     815
     816    <target name="installer" depends="preppkg, buildProperties, util-list-changes" >
     817        <taskdef name="izpack" classpath="${basedir}/installer/lib/izpack/standalone-compiler.jar" classname="com.izforge.izpack.ant.IzPackTask" />
     818        <mkdir dir="pkg-temp/installer" />
     819        <!-- set if unset -->
     820        <property name="workspace.changes.util.tr" value="" />
    800821        <jar destfile="./pkg-temp/installer/copy.jar" basedir="./core/java/build/obj" includes="net/i2p/util/Copy.class net/i2p/util/FileUtil.class">
    801822            <manifest>
Note: See TracChangeset for help on using the changeset viewer.