forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 10567 - xml/forrest/branches/copyless
Date Sun, 09 May 2004 03:44:13 GMT
Author: brondsem
Date: Sat May  8 20:44:12 2004
New Revision: 10567

Modified:
   xml/forrest/branches/copyless/build.xml
Log:
one release that includes src and bin (xml-forrest.jar) since they are so similar; clean more

Modified: xml/forrest/branches/copyless/build.xml
==============================================================================
--- xml/forrest/branches/copyless/build.xml	(original)
+++ xml/forrest/branches/copyless/build.xml	Sat May  8 20:44:12 2004
@@ -48,6 +48,10 @@
     <property name="tools.dir"             location="tools"/>
     <property name="tools.jar"             location="${java.home}/../lib/tools.jar"/>
     <available file="${tools.jar}"         property="tools.jar.present"/>
+    
+    <property name="src-fresh-site"         location="src/core/fresh-site"/>
+    
+    <property name="forrestbot.dir"         location="scratchpad/forrestbot2"/>
 
     <buildnumber file="etc/build.number"/>
     <echo>
@@ -78,87 +82,28 @@
 
   <target name="clean" depends="init" description="Delete all generated files">
     <delete dir="${build.dir}"/>
+    <delete dir="${forrestbot.dir}/logs"/>
+    <delete dir="${forrestbot.dir}/work"/>
+    <delete dir="${forrestbot.dir}/build"/>
+    <delete dir="${forrestbot.dir}/webapp/target"/>
+    <delete dir="${forrestbot.dir}/webapp/maven.log"/>
+    <delete dir="src/core/context/WEB-INF/logs"/>
   </target>
 
+  <target name="dist-clean" depends="init, clean" description="Delete all non-forrest
files">
+    <delete dir="${forrestbot.dir}/*.settings"/>
+    <delete file="**/*.bak"/>
+    <delete file="**/*~"/>
+  </target>
 
   <!-- =================================================================== -->
   <!-- Make release distributions                                          -->
   <!-- =================================================================== -->
 
 
-  <target name="release-dist-src" depends="init"
-    description="Makes a source release distribution">
-    <mkdir dir="${dist.dir}"/>
-
-    <!-- Hackery to fix linefeeds and permissions before zipping -->
-    <patternset id="scripts">
-      <include name="**/*.bat"/>
-      <include name="**/*.sh"/>
-      <include name="**/ant"/>
-      <include name="**/forrest"/>
-    </patternset>
-
-    <patternset id="noscripts">
-      <exclude name="**/*.bat"/>
-      <exclude name="**/*.sh"/>
-      <exclude name="**/ant"/>
-      <exclude name="**/forrest"/>
-    </patternset>
-
-    <property name="tmp-scripts" location="${build.dir}/tmp/scripts"/>
-    <mkdir dir="${tmp-scripts}"/>
-    <copy todir="${tmp-scripts}">
-      <fileset dir=".">
-        <patternset refid="scripts"/>
-      </fileset>
-    </copy>
-    <fixcrlf eol="crlf" srcdir="${tmp-scripts}" includes="**/*.bat"/>
-    <fixcrlf eol="lf" srcdir="${tmp-scripts}" excludes="**/*.bat"/>
-    <chmod dir="${tmp-scripts}" perm="ugo+rx" excludes="**/*.bat"/> 
-    <property name="tmp-fresh-site" location="${build.dir}/tmp/fresh-site"/>
-    <copy todir="${tmp-fresh-site}">
-      <fileset dir="${src-fresh-site}" />
-    </copy>
-    <fixcrlf eol="crlf" srcdir="${tmp-fresh-site}" excludes="**/*.gif **/*.png"/>
-
-    <property name="release-name-src" value="${name}-${version}-src"/>
-    <zip
-      file="${dist.dir}/${release-name-src}.zip" >
-      <zipfileset dir="." prefix="${release-name-src}">
-        <exclude name="build/**"/>
-        <patternset refid="noscripts"/>
-      </zipfileset>
-      <zipfileset prefix="${release-name-src}" dir="${tmp-scripts}"/>
-      <zipfileset prefix="${release-name-src}" dir="etc" includes="RELEASE-NOTES-${version}.txt"/>
-    </zip>
-
-    <tar longfile="gnu"
-      compression="gzip"
-      destfile="${dist.dir}/${release-name-src}.tar.gz" >
-      <tarfileset dir="." prefix="${release-name-src}" username="forrest" group="forrest">
-        <exclude name="build/**"/>
-        <patternset refid="noscripts"/>
-      </tarfileset>
-      <tarfileset prefix="${release-name-src}" dir="${tmp-scripts}"
-        mode="755" username="forrest" group="forrest">
-        <include name="**/*.sh"/>
-        <include name="**/ant"/>
-        <include name="**/forrest"/>
-      </tarfileset>
-      <tarfileset prefix="${release-name-src}" dir="${tmp-scripts}"
-        username="forrest" group="forrest">
-        <exclude name="**/*.sh"/>
-        <exclude name="**/ant"/>
-        <exclude name="**/forrest"/>
-      </tarfileset>
-      <tarfileset prefix="${release-name-src}" dir="etc" includes="RELEASE-NOTES-${version}.txt"/>
-    </tar>
-  </target>
-
-
-  <target name="release-dist-bin" depends="init, dist-shbat" 
-    description="Makes a binary release distribution">
-    <property name="release-name-bin" value="${name}-${version}-bin"/>
+  <target name="release-dist" depends="init, dist-clean, dist-shbat" 
+    description="Makes release distributions">
+    <property name="release-name-bin" value="${name}-${version}"/>
     <zip
       file="${dist.dir}/${release-name-bin}.zip" >
       <zipfileset dir="${dist-shbat.dir}" prefix="${release-name-bin}"/>
@@ -185,11 +130,6 @@
     </tar>
   </target>
 
-  <target name="release-dist" 
-    description="Makes source and binary release distributions"
-    depends="release-dist-bin, release-dist-src"/>
-
-
 
   <!-- =================================================================== -->
   <!-- Make all known distributions                                        -->
@@ -251,9 +191,14 @@
     <copy todir="${dist-shbat.dir}">
       <fileset dir="." >
         <exclude name="build/**"/>
-      </fileset>  
+      </fileset>
+    </copy>
+     <copy todir="${dist-shbat.dir}">
+       <fileset dir="." >
+        <include name="build/xml-forrest.jar"/>
+      </fileset>
     </copy>
-     
+        
     <!-- Fix bin/ permissions -->
     <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/src/core/bin" includes="*.bat"/>
     <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/src/core/bin" excludes="*.bat"/>
@@ -300,9 +245,9 @@
   <!-- ================================== -->
   <target name="test" 
           depends="testseed" 
-          description="Test that the features are ok before commmitting."/>
+          description="Test that the features are ok before committing."/>
 
-  <target  name="testseed" depends="init" description="Test that the features are ok before
commmitting.">
+  <target  name="testseed" depends="init" description="Test that the features are ok before
committing.">
     <property name="forrest.home" value="${dist-shbat.dir}" />  
     <property name="test.dir" value="${build.dir}/test"/>
     <delete dir="${test.dir}"/>

Mime
View raw message