You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by se...@apache.org on 2002/08/30 21:20:51 UTC

cvs commit: xml-axis/java/tools build.xml

seibert     2002/08/30 12:20:51

  Modified:    java     buildPreTestTaskdefs.xml
               java/tools build.xml
  Log:
  Gets rid of Tom J.'s annoying "extraneous build" problem
  
  It will still call the functions, but they won't exec anything
  
  Revision  Changes    Path
  1.5       +1 -1      xml-axis/java/buildPreTestTaskdefs.xml
  
  Index: buildPreTestTaskdefs.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/buildPreTestTaskdefs.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- buildPreTestTaskdefs.xml	14 Aug 2002 16:28:19 -0000	1.4
  +++ buildPreTestTaskdefs.xml	30 Aug 2002 19:20:51 -0000	1.5
  @@ -13,7 +13,7 @@
           &paths;
           &taskdefs;
   
  -  <target name="compile">
  +  <target name="compile" unless="axis-ant.present">
       <mkdir dir="${build.dest}"/>
       <mkdir dir="${build.lib}"/>
   
  
  
  
  1.2       +5 -6      xml-axis/java/tools/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/tools/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	27 Aug 2002 16:04:55 -0000	1.1
  +++ build.xml	30 Aug 2002 19:20:51 -0000	1.2
  @@ -44,15 +44,14 @@
       <echo message="Removing ${build.dir}/tools/${componentName}" />
       <delete dir="${build.dir}/tools/${componentName}" />
       <delete file="${build.lib}/axis-ant.jar"/>
  -</target>
  -
  -<target name="copy" depends="setenv,clean">
      <mkdir dir="${build.dir}/tools"/>
   </target>
   
  -<target name="compile" depends="copy">
  -  <echo message="Compiling tools.ant"/>
  +<target name="copy" depends="setenv"/>
   
  +<target name="compile" depends="copy" unless="axis-ant.present">
  +  <echo message="Compiling tools.ant"/>
  +  <echo message="${axis-ant.present}"/>
       <!-- build my ForEach task -->
       <echo message="Building ForEach" />
       <javac srcdir="${axis.home}/tools/${componentName}/foreach" destdir="${build.dir}/tools">
  @@ -87,7 +86,7 @@
     </jar>
   </target>
   
  -<target name="test" >
  +<target name="test" unless="axis-ant.present">
      <ant antfile="${axis.home}/tools/test.xml" /> 
   </target>