You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/02/27 10:58:01 UTC

cvs commit: jakarta-cactus build.xml

vmassol     2003/02/27 01:58:00

  Modified:    .        build.xml
  Log:
  Make sure that the master build builds everything, in the correct order.
  
  Revision  Changes    Path
  1.41      +82 -41    jakarta-cactus/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- build.xml	3 Feb 2003 10:52:43 -0000	1.40
  +++ build.xml	27 Feb 2003 09:58:00 -0000	1.41
  @@ -32,21 +32,59 @@
   
           <ant antfile="anttasks/build.xml" inheritAll="false" 
               target="release"/>
  +
  +        <ant antfile="framework/build.xml" inheritAll="false" 
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +            <property name="clover.enable" value="true"/> 
  +        </ant>
  +
           <ant antfile="framework/build.xml" inheritAll="false" 
  -            target="release"/>
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +            <property name="clover.enable" value="true"/> 
  +        </ant>
  +
           <ant antfile="integration/ant/build.xml" inheritAll="false" 
  -            target="release"/>
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +        </ant>
  +
  +        <ant antfile="integration/ant/build.xml" inheritAll="false" 
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +        </ant>
  +            
  +        <ant antfile="integration/eclipse/build.xml" inheritAll="false" 
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +        </ant>
  +
           <ant antfile="integration/eclipse/build.xml" inheritAll="false" 
  -            target="release"/>
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +        </ant>
  +        
           <ant antfile="samples/servlet/build.xml" inheritAll="false" 
  -            target="release"/>
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +            <property name="clover.enable" value="true"/> 
  +        </ant>
  +
  +        <ant antfile="samples/servlet/build.xml" inheritAll="false" 
  +            target="release">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +            <property name="clover.enable" value="true"/> 
  +        </ant>
  +        
           <ant antfile="documentation/build.xml" inheritAll="false" 
               target="release">
               <property name="javadoc.include" value="true"/>
  +            <property name="clover.enable" value="true"/> 
           </ant>
   
       </target>
  -   
  +
       <!--
          ========================================================================
            Clean all generated files by all Cactus subprojects.
  @@ -54,55 +92,58 @@
       -->
       <target name="clean">
   
  +        <delete dir="target-12"/>
  +        <delete dir="target-13"/>
  +        <delete>
  +            <fileset dir="." includes="**/*.log"/>
  +        </delete>
  + 
           <ant antfile="anttasks/build.xml" inheritAll="false" 
               target="clean"/>
  -        <ant antfile="framework/build.xml" inheritAll="false" 
  -            target="clean"/>
  -        <ant antfile="integration/ant/build.xml" inheritAll="false" 
  -            target="clean"/>
  -        <ant antfile="integration/eclipse/build.xml" inheritAll="false" 
  -            target="clean"/>
  -        <ant antfile="samples/servlet/build.xml" inheritAll="false" 
  -            target="clean"/>
  -        <ant antfile="documentation/build.xml" inheritAll="false" 
  -            target="clean"/>
   
  -    </target>
  -
  -    <!--
  -       ========================================================================
  -         Generate the release files for all the Cactus subprojects and for 
  -         all supported J2EE APIs.
  -       ========================================================================
  -    -->
  -    <target name="release.all">
  -
  -        <ant inheritAll="false" target="release">
  -            <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  +        <ant antfile="framework/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
           </ant>
   
  -        <ant inheritAll="false" target="release">
  -            <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  +        <ant antfile="framework/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
           </ant>
   
  -    </target>
  +        <ant antfile="integration/ant/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +        </ant>
   
  -    <!--
  -       ========================================================================
  -         Clean all generated files by all Cactus subprojects and for all
  -         supported J2EE APIs.
  -       ========================================================================
  -    -->
  -    <target name="clean.all">
  +        <ant antfile="integration/ant/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +        </ant>
  +        
  +        <ant antfile="integration/eclipse/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
  +        </ant>
   
  -        <ant inheritAll="false" target="clean">
  -            <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  +        <ant antfile="integration/eclipse/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
  +        </ant>
  +        
  +        <ant antfile="samples/servlet/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.12.jar}"/> 
           </ant>
   
  -        <ant inheritAll="false" target="clean">
  -            <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  +        <ant antfile="samples/servlet/build.xml" inheritAll="false" 
  +            target="clean">
  +            <property name="j2ee.jar" value="${j2ee.13.jar}"/> 
           </ant>
           
  +        <ant antfile="documentation/build.xml" inheritAll="false" 
  +            target="clean"/>
  +
       </target>
   
   </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org