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

[guillaume at wyona.com]

Author: guillaume
Date: 2009-04-08 09:51:25 +0200 (Wed, 08 Apr 2009)
New Revision: 42303

Modified:
   public/yanel/trunk/src/build/targets/clean.xml
   public/yanel/trunk/src/build/targets/realms.xml
   public/yanel/trunk/src/build/targets/resources.xml
Log:
Refactoring: using the new Ant property for the absolute path of the configuration directory in more places.

This still has to be used *everywhere* in the build scripts to be really usable,
 I only changed it in the places where I really need it for now
 (to make use of relative paths in Yanel configuration possible at build time),
 no harm will be done provided you do not use it without completing these changes!

Issue: 6888


Modified: public/yanel/trunk/src/build/targets/clean.xml
===================================================================
--- public/yanel/trunk/src/build/targets/clean.xml	2009-04-08 06:41:14 UTC (rev 42302)
+++ public/yanel/trunk/src/build/targets/clean.xml	2009-04-08 07:51:25 UTC (rev 42303)
@@ -60,7 +60,7 @@
     <antcall target="ask-if-local-build-properties-shall-be-deleted"/>
 
     <condition property="local.config.dir.exists">
-      <available file="${yanel.source.home}/${local.config.dir}" type="dir"/>
+      <available file="${local.config.home}" type="dir"/>
     </condition>
     <antcall target="ask-if-local-config-dir-shall-be-deleted"/>
   </target>
@@ -86,7 +86,7 @@
   </target>
 
   <target name="ask-if-local-config-dir-shall-be-deleted" if="local.config.dir.exists">
-    <input message="Do you really want to delete local config dir '${yanel.source.home}/${local.config.dir}'? (yes/NO):" addproperty="answerDeleteLocalConfigDir"/>
+    <input message="Do you really want to delete local config dir '${local.config.home}'? (yes/NO):" addproperty="answerDeleteLocalConfigDir"/>
     <condition property="yes-delete-local-config-dir">
       <equals arg1="yes" arg2="${answerDeleteLocalConfigDir}"/>
     </condition>
@@ -94,7 +94,7 @@
   </target>
 
   <target name="do-delete-local-config-dir" if="yes-delete-local-config-dir">
-    <delete dir="${yanel.source.home}/${local.config.dir}"/>
+    <delete dir="${local.config.home}"/>
   </target>
   
 </project>

Modified: public/yanel/trunk/src/build/targets/realms.xml
===================================================================
--- public/yanel/trunk/src/build/targets/realms.xml	2009-04-08 06:41:14 UTC (rev 42302)
+++ public/yanel/trunk/src/build/targets/realms.xml	2009-04-08 07:51:25 UTC (rev 42303)
@@ -9,7 +9,7 @@
   <!-- Build Realms -->
   <target name="build-realms" description="Build realms" depends="generate-realms-build">
     <condition property="local.realms.config.exists">
-      <available file="${yanel.source.home}/${local.config.dir}/local.realms.xml" type="file"/>
+      <available file="${local.config.home}/local.realms.xml" type="file"/>
     </condition>
     <antcall target="check-config-version-realms-xml"/>
 
@@ -19,7 +19,7 @@
 
   <target name="generate-realms-build" description="Generate realms build" depends="init">
     <condition property="local.realms.config.exists">
-      <available file="${yanel.source.home}/${local.config.dir}/local.realms.xml" type="file"/>
+      <available file="${local.config.home}/local.realms.xml" type="file"/>
     </condition>
     <antcall target="generate-realms-build-from-default"/>
     <antcall target="generate-realms-build-from-local"/>
@@ -37,7 +37,7 @@
   </target>
 
   <target name="generate-realms-build-from-local" description="Generate realms build from local config" depends="init" if="local.realms.config.exists">
-    <xslt in="${yanel.source.home}/${local.config.dir}/local.realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="true">
+    <xslt in="${local.config.home}/local.realms.xml" out="../../build/build-realms.xml" style="yanel2realms.xsl" force="true">
       <param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
       <param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
       <param name="maven.url" expression="${maven.url}"/>

Modified: public/yanel/trunk/src/build/targets/resources.xml
===================================================================
--- public/yanel/trunk/src/build/targets/resources.xml	2009-04-08 06:41:14 UTC (rev 42302)
+++ public/yanel/trunk/src/build/targets/resources.xml	2009-04-08 07:51:25 UTC (rev 42303)
@@ -53,11 +53,11 @@
 -->
 
 <!-- TODO: An exception is thrown by the spring framework ...
-    <merge-resource-types-configs defaultrealmsconfigdir="${yanel.source.home}/conf/" localrealmsconfigdir="${yanel.source.home}/${local.config.dir}/"/>
+    <merge-resource-types-configs defaultrealmsconfigdir="${yanel.source.home}/conf/" localrealmsconfigdir="${local.config.home}/"/>
 -->
 
     <condition property="local.resource-types.config.exists">
-      <available file="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" type="file"/>
+      <available file="${local.config.home}/local.resource-types.xml" type="file"/>
     </condition>
     <antcall target="generate-resources-build-from-default"/>
     <antcall target="generate-resources-build-from-local"/>
@@ -76,7 +76,7 @@
   </target>
 
   <target name="generate-resources-build-from-local" description="Generate resources build from local config" depends="init" if="local.resource-types.config.exists">
-    <xslt in="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" out="../../build/build-resource-types.xml" style="yanel2resources.xsl" force="true">
+    <xslt in="${local.config.home}/local.resource-types.xml" out="../../build/build-resource-types.xml" style="yanel2resources.xsl" force="true">
       <param name="servlet.context.prefix" expression="${servlet.context.prefix}"/>
       <param name="yanel.source.version" expression="${yanel.version}-r${yanel.revision}"/>
       <param name="maven.url" expression="${maven.url}"/>
@@ -85,7 +85,7 @@
 
   <target name="build-resources" description="Build resources" depends="generate-resources-build">
     <condition property="local.resource-types.config.exists">
-      <available file="${yanel.source.home}/${local.config.dir}/local.resource-types.xml" type="file"/>
+      <available file="${local.config.home}/local.resource-types.xml" type="file"/>
     </condition>
     <antcall target="check-config-version-resource-types-xml"/>