struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsm...@apache.org
Subject svn commit: r230366 - /struts/shale/trunk/build.xml
Date Fri, 05 Aug 2005 00:36:20 GMT
Author: wsmoak
Date: Thu Aug  4 17:36:06 2005
New Revision: 230366

URL: http://svn.apache.org/viewcvs?rev=230366&view=rev
Log:
Reorganize directory structures for the 'release' target

Modified:
    struts/shale/trunk/build.xml

Modified: struts/shale/trunk/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.xml?rev=230366&r1=230365&r2=230366&view=diff
==============================================================================
--- struts/shale/trunk/build.xml (original)
+++ struts/shale/trunk/build.xml Thu Aug  4 17:36:06 2005
@@ -281,7 +281,7 @@
   <!-- These targets execute the corresponding target for all modules. -->
 
 
-  <target        name="clean"
+  <target        name="clean"   depends="clean-release"
           description="Execute 'clean' on all modules">
 
     <antcall   target="execute">
@@ -488,75 +488,78 @@
 
   <!-- ====================== Release Targets ============================== -->
 
+  <property      name="target.dir" value="target"/>
+  <property      name="dist.dir"   value="dist"/>
 
-  <target        name="release"
+  <target        name="clean-release">
+    <delete      dir="${target.dir}"/>
+    <delete      dir="${dist.dir}"/>
+  </target>
+
+  <target        name="release" depends="clean-release"
           description="Construct release artifacts">
 
     <echo     message="---------- Create Release Artifacts For Version ${project.version}
----------"/>
 
     <!-- Construct overall release directory -->
-    <delete       dir="shale-framework-${project.version}"/>
-    <mkdir        dir="shale-framework-${project.version}"/>
-    <mkdir        dir="shale-framework-${project.version}/lib"/>
-    <mkdir        dir="shale-framework-${project.version}/webapps"/>
+    <mkdir        dir="${target.dir}"/>
+    <mkdir        dir="${target.dir}/lib"/>
+    <mkdir        dir="${target.dir}/webapps"/>
+    <mkdir        dir="${dist.dir}"/>
 
     <!-- Copy clay-plugin artifacts -->
-    <mkdir        dir="shale-framework-${project.version}/clay-plugin"/>
-    <copy       todir="shale-framework-${project.version}/clay-plugin">
+    <mkdir        dir="${target.dir}/clay-plugin"/>
+    <copy       todir="${target.dir}/clay-plugin">
       <fileset    dir="clay-plugin/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="shale-framework-${project.version}/lib">
+    <copy       todir="${target.dir}/lib">
       <fileset    dir="clay-plugin/dist/lib"
              includes="*.jar"/>
     </copy>
 
     <!-- Copy core-library artifacts -->
-    <mkdir        dir="shale-framework-${project.version}/core-library"/>
-    <copy       todir="shale-framework-${project.version}/core-library">
+    <mkdir        dir="${target.dir}/core-library"/>
+    <copy       todir="${target.dir}/core-library">
       <fileset    dir="core-library/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="shale-framework-${project.version}/lib">
+    <copy       todir="${target.dir}/lib">
       <fileset    dir="core-library/dist/lib"
              includes="*.jar"/>
     </copy>
 
     <!-- Copy test-framework artifacts -->
-    <mkdir        dir="shale-framework-${project.version}/test-framework"/>
-    <copy       todir="shale-framework-${project.version}/test-framework">
+    <mkdir        dir="${target.dir}/test-framework"/>
+    <copy       todir="${target.dir}/test-framework">
       <fileset    dir="test-framework/dist"
              excludes="lib/**"/>
     </copy>
-    <copy       todir="shale-framework-${project.version}/lib">
+    <copy       todir="${target.dir}/lib">
       <fileset    dir="test-framework/dist/lib"
              includes="*.jar"/>
     </copy>
 
     <!-- Copy use-cases artifacts -->
-    <mkdir        dir="shale-framework-${project.version}/use-cases"/>
-    <copy       todir="shale-framework-${project.version}/use-cases">
+    <mkdir        dir="${target.dir}/use-cases"/>
+    <copy       todir="${target.dir}/use-cases">
       <fileset    dir="use-cases/dist"
              excludes="**/*.war"/>
     </copy>
-    <copy       todir="shale-framework-${project.version}/webapps">
+    <copy       todir="${target.dir}/webapps">
       <fileset    dir="use-cases/dist"
              includes="**/*.war"/>
     </copy>
 
     <!-- Construct archive files -->
-    <delete      file="shale-framework-${project.version}.tar.gz"/>
-    <tar      tarfile="shale-framework-${project.version}.tar.gz"
-              basedir="${basedir}"
-             includes="shale-framework-${project.version}/**"
+    <tar      tarfile="${dist.dir}/shale-framework-${project.version}.tar.gz"
           compression="gzip"
-             longfile="gnu"/>
-    <delete      file="shale-framework-${project.version}.zip"/>
-    <zip     destfile="shale-framework-${project.version}.zip"
-              basedir="${basedir}"
-             includes="shale-framework-${project.version}/**"/>
-    
-
+             longfile="gnu">
+      <tarfileset dir="${target.dir}" prefix="shale-framework-${project.version}"/>
+    </tar>
+    <zip     destfile="${dist.dir}/shale-framework-${project.version}.zip">
+      <zipfileset dir="${target.dir}" prefix="shale-framework-${project.version}"/>
+    </zip>
   </target>
 
 



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


Mime
View raw message