Changeset 56baf92


Ignore:
Timestamp:
Mar 31, 2011 9:33:12 PM (14 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master
Children:
10f5e84
Parents:
6a03b9f
Message:

Still finding the right dependencies

File:
1 edited

Legend:

Unmodified
Added
Removed

  • axis/build.xml

    r6a03b9f r56baf92  
    2727  <property name="wsdl.dir" value="../wsdl"/>
    2828  <property name="cert.pem" value="./emulab.pem"/>
     29  <property name="version" value="1.0"/>
     30  <property name="fedd.jar" value="fedd-${version}.jar"/>
    2931
    3032  <path id="compile.classpath">
    … …  
    3234  </path>
    3335
     36  <path id="run.classpath">
     37    <fileset dir="${lib.dir}" includes="**/*.jar"/>
     38    <fileset dir="${jar.dir}" includes="**/*.jar"/>
     39  </path>
     40
     41
    3442  <taskdef resource="axis-tasks.properties" classpathref="compile.classpath" />
    3543
    36   <target name="all" depends="clean" description="Clean then build" />
    37 
     44  <target name="all" depends="clean,jar" description="Clean then build" />
     45  <target name="run" depends="multistatus" description="Run multistatus" />
     46
     47  <!-- remove all derived and compiled files -->
    3848  <target name="clean">
    3949    <delete dir="${basedir}${file.separator}edu"/>
    … …  
    4353    <delete file="${keystore.file}"/>
    4454  </target>
     55
     56  <!-- just remove command files -->
     57  <target name="clean-commands" >
     58    <delete>
     59      <fileset dir="${classes.dir}"
     60        includes="**/FeddCommand.class **/Create.class **/MultiStatus.class **/Terminate.class"/>
     61    </delete>
     62  </target>
     63
    4564
    4665  <!-- Check to see if the keystore file exists, if so the keystore.available
    … …  
    100119
    101120  <!-- Documentation targets -->
     121  <!-- Generate basic javadoc -->
    102122  <target name="doc" description="Generate API documentation">
    103123    <mkdir dir="${doc.dir}"/>
    … …  
    107127  </target>
    108128
     129  <!-- Generate pedentically complete javadoc -->
    109130  <target name="dev-doc"
    110131    description="Generate detailed/developer API documentation">
    … …  
    131152  </target>
    132153
     154  <!-- check to see if the test classes and are present.  If so
     155       set the compile.done property -->
     156  <target name="compile.check">
     157    <condition property="compile.done">
     158      <and>
     159        <available file="${classes.dir}${file.separator}Create.class"/>
     160        <available file="${classes.dir}${file.separator}MultiStatus.class"/>
     161        <available file="${classes.dir}${file.separator}Terminate.class"/>
     162        <available file="${classes.dir}${file.separator}FeddCommand.class"/>
     163      </and>
     164    </condition>
     165  </target>
     166
     167
    133168  <!-- compile the sources into the build directory.  Depends on the
    134        wsdl-generated files being created. -->
    135   <target name="compile" depends="wsdl-parse" description="Compile the source">
     169       wsdl-generated files being created, and only happens if one if
     170       one or more of the files checked for by the compile.check target
     171       is missing. -->
     172  <target name="compile" depends="wsdl-parse,compile.check"
     173    unless="compile.done" description="Compile the source">
    136174    <mkdir dir="${classes.dir}" />
    137175    <javac srcdir="${src.dir}" destdir="${classes.dir}"
    … …  
    139177  </target>
    140178
     179  <!-- Create the fedd jar file in ${jar.dir} (build/jar) -->
     180  <target name="jar" depends="compile" description="make fedd jar">
     181    <jar destfile="${jar.dir}${file.separator}${fedd.jar}"
     182      basedir="${classes.dir}"
     183      excludes="**/Create.class **/MultiStatus.class **/Terminate.class **/FeddCommand.class"/>
     184  </target>
     185
    141186  <!-- Test programs -->
    142   <target name="multistatus" depends="compile,keys"
     187  <target name="multistatus" depends="compile,jar,keys"
    143188    description="run visualizer">
    144189    <java classname="MultiStatus" fork="true" >
    145190      <classpath>
    146         <path refid="compile.classpath"/>
     191        <path refid="run.classpath"/>
    147192        <pathelement path="${classes.dir}"/>
    148193      </classpath>
    … …  
    150195  </target>
    151196
    152   <target name="create" depends="compile,keys"
     197  <target name="create" depends="compile,jar,keys"
    153198    description="run visualizer">
    154199    <java classname="Create" fork="true" >
    155200      <classpath>
    156         <path refid="compile.classpath"/>
     201        <path refid="run.classpath"/>
    157202        <pathelement path="${classes.dir}"/>
    158203      </classpath>
    159204      <arg value="${user.name}-test"/>
    160     </java>
    161   </target>
    162 
    163 
    164   <target name="terminate" depends="compile,keys"
     205      <arg file="./deter-only.tcl"/>
     206    </java>
     207  </target>
     208
     209
     210  <target name="terminate" depends="compile,jar,keys"
    165211    description="run visualizer">
    166212    <java classname="Terminate" fork="true" >
    167213      <classpath>
    168         <path refid="compile.classpath"/>
     214        <path refid="run.classpath"/>
    169215        <pathelement path="${classes.dir}"/>
    170216      </classpath>
Note: See TracChangeset for help on using the changeset viewer.