[Yanel-commits] rev 29085 - public/yanel/trunk/src/build

[michi at wyona.com]

Author: michi
Date: 2007-11-20 20:32:15 +0100 (Tue, 20 Nov 2007)
New Revision: 29085

Modified:
   public/yanel/trunk/src/build/build.xml
Log:
ask and do delete of local.build.properties implemented

Modified: public/yanel/trunk/src/build/build.xml
===================================================================
--- public/yanel/trunk/src/build/build.xml	2007-11-20 16:29:01 UTC (rev 29084)
+++ public/yanel/trunk/src/build/build.xml	2007-11-20 19:32:15 UTC (rev 29085)
@@ -792,16 +792,35 @@
       <available file="${yanel.home.dir}/src/build/local.build.properties" type="file"/>
     </condition>
     <antcall target="ask-if-local-build-properties-shall-be-deleted"/>
+
+    <condition property="local.config.dir.exists">
+      <available file="${yanel.home.dir}/${local.config.dir}" type="dir"/>
+    </condition>
+    <antcall target="ask-if-local-config-dir-shall-be-deleted"/>
+  </target>
+
+  <target name="ask-if-local-build-properties-shall-be-deleted" if="local.build.properties.exists">
+    <input message="Do you really want to delete local build.properties file '${yanel.home.dir}/src/build/local.build.properties'? (yes/NO):" addproperty="answer"/>
+    <condition property="yes-delete-local-build-properties">
+      <equals arg1="yes" arg2="${answer}"/>
+    </condition>
+    <antcall target="do-delete-local-build-properties"/>
 <!--
     <delete file="${yanel.home.dir}/src/build/local.build.properties"/>
-    <delete dir="${yanel.home.dir}/${local.config.dir}"/>
 -->
   </target>
 
-  <target name="ask-if-local-build-properties-shall-be-deleted" if="local.build.properties.exists">
-    <echo>Shall local.build.properties be deleted?</echo>
+  <target name="do-delete-local-build-properties" if="yes-delete-local-build-properties">
+    <delete file="${yanel.home.dir}/src/build/local.build.properties"/>
   </target>
 
+  <target name="ask-if-local-config-dir-shall-be-deleted" if="local.config.dir.exists">
+    <echo>Shall local config dir ${yanel.home.dir}/${local.config.dir} be deleted?</echo>
+<!--
+    <delete dir="${yanel.home.dir}/${local.config.dir}"/>
+-->
+  </target>
+
   <target name="ask-to-clean-tomcat-cluster-node1" if="property-tomcat-cluster-node1-is-set" description="Clean Tomcat cluster node 1">
     <input message="Do you really want to delete your deployed (maybe productive) Yanel version at '${tomcat1.webapps.dir}/${servlet.context.prefix}'? (yes/NO):" addproperty="answer"/>
     <condition property="yes-delete-tomcat-cluster-node1">