[Yanel-commits] rev 26529 - public/yanel/contributions/projects/yanel-minimal

michi at wyona.com michi at wyona.com
Mon Aug 6 15:31:18 CEST 2007


Author: michi
Date: 2007-08-06 15:31:17 +0200 (Mon, 06 Aug 2007)
New Revision: 26529

Modified:
   public/yanel/contributions/projects/yanel-minimal/build.xml
Log:
build dir introduced

Modified: public/yanel/contributions/projects/yanel-minimal/build.xml
===================================================================
--- public/yanel/contributions/projects/yanel-minimal/build.xml	2007-08-06 13:30:59 UTC (rev 26528)
+++ public/yanel/contributions/projects/yanel-minimal/build.xml	2007-08-06 13:31:17 UTC (rev 26529)
@@ -9,73 +9,75 @@
   <import file="dependencies.xml"/>
   
   <target name="init" depends="dependencies">
-    <mkdir dir="webapps"/>
-    <mkdir dir="webapps/${project.name}"/>
-    <mkdir dir="webapps/${project.name}/WEB-INF"/>
-    <mkdir dir="webapps/${project.name}/WEB-INF/logs"/>
-    <mkdir dir="webapps/${project.name}/WEB-INF/classes"/>
-    <mkdir dir="webapps/${project.name}/WEB-INF/lib"/>
-    <property name="build.dir" value="."/>
+    <property name="build.dir" value="build"/>
+    <mkdir dir="${build.dir}"/>
+    <property name="webapps.dir" value="${build.dir}/webapps"/>
+    <mkdir dir="${webapps.dir}"/>
+    <mkdir dir="${webapps.dir}/${project.name}"/>
+    <mkdir dir="${webapps.dir}/${project.name}/WEB-INF"/>
+    <mkdir dir="${webapps.dir}/${project.name}/WEB-INF/logs"/>
+    <mkdir dir="${webapps.dir}/${project.name}/WEB-INF/classes"/>
+    <mkdir dir="${webapps.dir}/${project.name}/WEB-INF/lib"/>
   </target>
 
   <target name="build-webapp" depends="init, build-resources">
-    <copy file="config/web.xml" tofile="webapps/${project.name}/WEB-INF/web.xml" overwrite="true"/>
+    <copy file="config/web.xml" tofile="${webapps.dir}/${project.name}/WEB-INF/web.xml" overwrite="true"/>
     
-    <copy todir="webapps/${project.name}/WEB-INF/classes">
+    <copy todir="${webapps.dir}/${project.name}/WEB-INF/classes">
       <fileset dir="config">
         <exclude name="web.xml"/>
       </fileset>
     </copy>
 
-    <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.name}">
+    <replace file="${webapps.dir}/${project.name}/WEB-INF/classes/install.rdf" value="${project.name}">
       <replacetoken>@PROJECTNAME@</replacetoken>
     </replace>
-    <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="${project.version}-r${project.revision}">
+    <replace file="${webapps.dir}/${project.name}/WEB-INF/classes/install.rdf" value="${project.version}-r${project.revision}">
       <replacetoken>@VERSION@</replacetoken>
     </replace>
-    <replace file="webapps/${project.name}/WEB-INF/classes/install.rdf" value="war">
+    <replace file="${webapps.dir}/${project.name}/WEB-INF/classes/install.rdf" value="war">
       <replacetoken>@INSTALLTYPE@</replacetoken>
     </replace>
 
-    <copy todir="webapps/${project.name}/realms">
+    <copy todir="${webapps.dir}/${project.name}/realms">
       <fileset dir="realms"/>
     </copy>
 
-    <copy todir="webapps/${project.name}/resource-types">
+    <copy todir="${webapps.dir}/${project.name}/resource-types">
       <fileset dir="resource-types"/>
     </copy>
     
-    <copy todir="webapps/${project.name}/WEB-INF/lib">
+    <copy todir="${webapps.dir}/${project.name}/WEB-INF/lib">
       <fileset refid="maven2.fileset"/>
       <mapper type="flatten"/>
     </copy>
   </target>
   
   <target name="build-resources" description="Build resources">
-    <ant target="compile" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
+    <ant target="compile" antfile="resource-types/file/build.xml" inheritAll="false">
       <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
     </ant>
     
-    <ant target="copy-dependencies" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
+    <ant target="copy-dependencies" antfile="resource-types/file/build.xml" inheritAll="false">
       <property value="${build.dir}" name="build.dir"/>
       <property value="yanel" name="servlet.context.prefix"/>
       <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
     </ant>
 
-    <copy todir="${build.dir}/webapps/${project.name}/WEB-INF/lib">
-      <fileset dir="${build.dir}/resource-types/file/build/lib"/>
+    <copy todir="${webapps.dir}/${project.name}/WEB-INF/lib">
+      <fileset dir="resource-types/file/build/lib"/>
     </copy>
   </target>
   
   <target name="war" description="Build war file" depends="build-webapp">
-    <jar jarfile="${project.name}.war" basedir="webapps/${project.name}"/>
+    <jar jarfile="${build.dir}/${project.name}.war" basedir="${webapps.dir}/${project.name}"/>
   </target>  
 
   <target name="clean" description="clean" depends="init">
-    <ant target="clean" antfile="${build.dir}/resource-types/file/build.xml" inheritAll="false">
+    <ant target="clean" antfile="resource-types/file/build.xml" inheritAll="false">
       <property value="${yanel.version}-r${yanel.revision}" name="yanel.source.version"/>
     </ant>
-    <delete dir="webapps"/>
+    <delete dir="${build.dir}"/>
   </target>  
   
-</project>  
\ No newline at end of file
+</project>  



More information about the Yanel-commits mailing list