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 2004/04/09 13:17:30 UTC

cvs commit: jakarta-cactus build.properties.sample build.xml build.properties.vmassol

vmassol     2004/04/09 04:17:30

  Modified:    .        build.properties.sample build.xml
                        build.properties.vmassol
  Log:
  Make the build of the Eclipse projects optional
  
  Revision  Changes    Path
  1.106     +5 -1      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- build.properties.sample	2 Apr 2004 14:08:25 -0000	1.105
  +++ build.properties.sample	9 Apr 2004 11:17:30 -0000	1.106
  @@ -122,6 +122,10 @@
   # Mandatory properties for the Eclipse plugin only
   # -----------------------------------------------------------------------------
   
  +# Do we build the Eclipse project as part of the master build? Uncomment
  +# to build Eclipse projects.
  +#eclipse.build = true
  +
   # Location of Eclipse.
   eclipse.home = D:/dev/eclipse-2.1
   
  
  
  
  1.70      +39 -31    jakarta-cactus/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.xml,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- build.xml	11 Mar 2004 17:38:25 -0000	1.69
  +++ build.xml	9 Apr 2004 11:17:30 -0000	1.70
  @@ -46,7 +46,7 @@
        ========================================================================
          Generate the release files for all the Cactus subprojects
        ========================================================================
  -  -->
  +  -->  
     <target name="dist"
         description="Invokes the 'dist' target of every sub-module">
   
  @@ -78,22 +78,7 @@
         <property name="clover.enable" value="true"/>
         <property name="env" value="${env}"/>
       </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml" 
  -        inheritAll="false" target="dist">
  -      <property name="env" value="${env}"/>
  -    </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  -        inheritAll="false" target="dist">
  -      <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  -      <property name="servlet.jar" value=""/>
  -      <property name="env" value="${env}"/>
  -    </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  -        inheritAll="false" target="dist">
  -      <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  -      <property name="servlet.jar" value=""/>
  -      <property name="env" value="${env}"/>
  -    </ant>
  +    <antcall target="dist-eclipse"/>
       <ant antfile="samples/servlet/build.xml" inheritAll="false" 
           target="dist">
         <property name="servlet.jar" value="${servlet.22.jar}"/>
  @@ -131,6 +116,25 @@
   
     </target>
   
  +  <target name="dist-eclipse" if="eclipse.build">
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml" 
  +        inheritAll="false" target="dist">
  +      <property name="env" value="${env}"/>
  +    </ant>
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  +        inheritAll="false" target="dist">
  +      <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  +      <property name="servlet.jar" value=""/>
  +      <property name="env" value="${env}"/>
  +    </ant>
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  +        inheritAll="false" target="dist">
  +      <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  +      <property name="servlet.jar" value=""/>
  +      <property name="env" value="${env}"/>
  +    </ant>
  +  </target>
  +  
     <!--
        ========================================================================
          Generate the release files for all the Cactus subprojects
  @@ -296,19 +300,7 @@
         <property name="j2ee.jar" value="${j2ee.13.jar}"/>
         <property name="servlet.jar" value=""/>
       </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml" 
  -        inheritAll="false" target="clean">
  -    </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  -        inheritAll="false" target="clean">
  -      <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  -      <property name="servlet.jar" value=""/>
  -    </ant>
  -    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  -        inheritAll="false" target="clean">
  -      <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  -      <property name="servlet.jar" value=""/>
  -    </ant>
  +    <antcall target="clean-eclipse"/>
       <ant antfile="samples/servlet/build.xml" inheritAll="false" 
           target="clean">
         <property name="servlet.jar" value="${servlet.22.jar}"/>
  @@ -334,6 +326,22 @@
   
     </target>
   
  +  <target name="clean-eclipse" if="eclipse.build">
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.webapp/build.xml" 
  +        inheritAll="false" target="clean">
  +    </ant>
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  +        inheritAll="false" target="clean">
  +      <property name="j2ee.jar" value="${j2ee.12.jar}"/>
  +      <property name="servlet.jar" value=""/>
  +    </ant>
  +    <ant antfile="integration/eclipse/org.apache.cactus.eclipse.runner/build.xml" 
  +        inheritAll="false" target="clean">
  +      <property name="j2ee.jar" value="${j2ee.13.jar}"/>
  +      <property name="servlet.jar" value=""/>
  +    </ant>
  +  </target>
  +  
     <!--
        ========================================================================
          Gathers all dependent jars and package them in a single zip. Useful 
  
  
  
  1.15      +5 -1      jakarta-cactus/build.properties.vmassol
  
  Index: build.properties.vmassol
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.vmassol,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.properties.vmassol	2 Apr 2004 14:08:25 -0000	1.14
  +++ build.properties.vmassol	9 Apr 2004 11:17:30 -0000	1.15
  @@ -90,6 +90,10 @@
   # Mandatory properties for the Eclipse plugin only
   # -----------------------------------------------------------------------------
   
  +# Do we build the Eclipse project as part of the master build? Uncomment
  +# to build Eclipse projects.
  +#eclipse.build = true
  +
   # Location of Eclipse.
   eclipse.home = C:/Apps/eclipse2.1
   
  
  
  

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