svn commit: r389064 - in /lenya/trunk/src/targets: init-build.xml webapp-build.xml

[th...@apache.org]

Author: thorsten
Date: Mon Mar 27 00:28:27 2006
New Revision: 389064

URL: http://svn.apache.org/viewcvs?rev=389064&view=rev
Log:
ASF Bugzilla Bug 39100
  create ant target to clean Cocoon, and clean-all (Lenya+Cocoon+Tomcat)
   Reporter/Patch provider: renaud richardet
 Thanks Renaud

Modified:
    lenya/trunk/src/targets/init-build.xml
    lenya/trunk/src/targets/webapp-build.xml

Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?rev=389064&r1=389063&r2=389064&view=diff
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Mon Mar 27 00:28:27 2006
@@ -62,7 +62,7 @@
     <condition property="local.blocks.properties.in.sync">
       <equals arg1="${lenya.blocks.properties.version}" arg2="374661"/>
     </condition>
-    <fail unless="local.blocks.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.blocks.properties is NOT in sync with ${src.cocoon.properties.dir}/local.blocks.properties! The file ${src.cocoon.properties.dir}/local.blocks.properties has probably been modified by some Apache Lenya developer. Issue a build clean in your Cocoon directory and rebuild Lenya."/>
+    <fail unless="local.blocks.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.blocks.properties is NOT in sync with ${src.cocoon.properties.dir}/local.blocks.properties! The file ${src.cocoon.properties.dir}/local.blocks.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean-all' and rebuild Lenya."/>
   </target>
 
   <!-- Check local.build.properties  -->
@@ -71,7 +71,7 @@
     <condition property="local.build.properties.in.sync">
       <equals arg1="${lenya.build.properties.version}" arg2="386155"/>
     </condition>
-    <fail unless="local.build.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.build.properties is NOT in sync with ${src.cocoon.properties.dir}/local.build.properties! The file ${src.cocoon.properties.dir}/local.build.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean' and remove 'local.build.properties' in your Cocoon directory (${cocoon.src.dir}) and rebuild Lenya."/>
+    <fail unless="local.build.properties.in.sync" message="It seems that your ${cocoon.src.dir}/local.build.properties is NOT in sync with ${src.cocoon.properties.dir}/local.build.properties! The file ${src.cocoon.properties.dir}/local.build.properties has probably been modified by some Apache Lenya developer. Issue a 'build clean-all' and rebuild Lenya."/>
   </target>
 
   <!-- Copy the bulk of the cocoon webapp to our destination -->

Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?rev=389064&r1=389063&r2=389064&view=diff
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Mon Mar 27 00:28:27 2006
@@ -207,14 +207,13 @@
 
   <!-- Clean Tomcat directories -->
   <target name="clean-tomcat" depends="clean" description="Clean the deployment by also cleaning the servlet engine context of Tomcat">
-    <delete dir="${tomcat.cache.dir}"/>
-    <mkdir dir="${tomcat.webapps.dir}" />
-    <delete includeEmptyDirs="true">
+    <delete dir="${tomcat.cache.dir}" quiet="true"/>
+    <delete includeEmptyDirs="true" quiet="true">
       <fileset dir="${tomcat.webapps.dir}" excludes="${target.reset.excludes}" />
     </delete>
   </target>
 
-  <!-- Cleans the build directory, with the exception of target.reset.excludes -->
+  <!-- Cleans the Lenya build directory, with the exception of target.reset.excludes -->
   <target name="clean" depends="init" description="Cleans the build directories">
     <mkdir dir="${build.root}"/> <!-- Create dir such that build process does not fail if build dir does not exist -->
     <delete includeEmptyDirs="true">
@@ -222,6 +221,18 @@
     </delete>
     <delete dir="${dist.root}"/>
   </target>
+
+  <!-- Cleans the Cocoon build directory and the local.p* files -->
+  <target name="clean-cocoon" depends="init" description="Cleans Cocoon">
+    <delete includeEmptyDirs="true" quiet="true">
+      <fileset dir="${cocoon.src.dir}/build"/>
+    </delete>
+    <delete file="${cocoon.src.dir}/local.build.properties" quiet="true"/>
+    <delete file="${cocoon.src.dir}/local.blocks.properties" quiet="true"/>
+  </target>
+
+  <!-- Cleans the build files of Lenya, Cocoon and Tomcat -->
+  <target name="clean-all" depends="init, clean, clean-cocoon, clean-tomcat " description="Cleans Lenya, Cocoon and Tomcat"/>
 
   <!-- Install the webapp into Tomcat -->
   <target name="install-tomcat" description="Install the webapp into Tomcat servlet engine context" if="servlet.engine.tomcat">



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org