abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r423987 - /incubator/abdera/java/trunk/build/build.xml
Date Thu, 20 Jul 2006 17:03:04 GMT
Author: jmsnell
Date: Thu Jul 20 10:03:03 2006
New Revision: 423987

URL: http://svn.apache.org/viewvc?rev=423987&view=rev
Log:
Building friendly zips

Modified:
    incubator/abdera/java/trunk/build/build.xml

Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=423987&r1=423986&r2=423987&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Thu Jul 20 10:03:03 2006
@@ -54,9 +54,8 @@
   <property name="json.src" value="${dependencies}/json/src" />
   <property name="json.src.java"
             value="${json.src}/main/java" />
-  <property name="json.version" value="1.0" />
 
-  <property name="json.jar" value="${dependencies}/json-${json.version}.jar" />
+  <property name="json.jar" value="${dependencies}/json.jar" />
 
   <property file="${dependencies}/deps.properties" />
   
@@ -267,7 +266,8 @@
   </target>
   
   <target name="zip" depends="retro"> 
-    <zip destfile="${basedir}/${ant.project.name}.${version}.zip">
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}"/>
+    <copy todir="${work}/dist/${ant.project.name}.${version}">
       <fileset dir="${dist}">
         <include name="**/*.jar" />
         <include name="**/legal/*" />
@@ -281,30 +281,44 @@
         <include name="NOTICE" />
         <include name="README" />
       </fileset>
-    </zip>
-      <zip destfile="${basedir}/${ant.project.name}.${version}.jdk142.zip">
-        <fileset dir="${dist}">
-          <include name="**/*.jar" />
-          <include name="**/legal/*" />
-          <exclude name="**/json/*" />
-          <exclude name="**/*.${version}.jar" />
-        </fileset>
-        <fileset dir="${docs}" includes="**/*" />
-        <fileset dir="${basedir}">
-          <include name="LICENSE" />
-          <include name="NOTICE" />
-          <include name="README" />
-        </fileset>
-      </zip>
-    <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip">
+    </copy>
+    <zip destfile="${basedir}/${ant.project.name}.${version}.zip" 
+         basedir="${work}/dist/" />
+    <delete dir="${work}/dist/${ant.project.name}.${version}" />
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}"/>
+    <copy todir="${work}/dist/${ant.project.name}.${version}">
+      <fileset dir="${dist}">
+        <include name="**/*.jar" />
+        <include name="**/legal/*" />
+        <exclude name="**/json/*" />
+        <exclude name="**/*.${version}.jar" />
+      </fileset>
+      <fileset dir="${docs}" includes="**/*" />
+      <fileset dir="${basedir}">
+        <include name="LICENSE" />
+        <include name="NOTICE" />
+        <include name="README" />
+      </fileset>
+    </copy>
+    <zip destfile="${basedir}/${ant.project.name}.${version}.jdk142.zip" 
+      basedir="${work}/dist/" />
+    <delete dir="${work}/dist/${ant.project.name}.${version}" />
+    <mkdir dir="${work}/dist/${ant.project.name}.${version}"/>
+    <copy todir="${work}/dist/${ant.project.name}.${version}">
       <fileset dir="${basedir}">
         <exclude name="dist/**/*" />
+        <exclude name="build/tools" />
+        <exclude name="build/work" />
         <exclude name="build/tools/**/*" />
+        <exclude name="build/work/**/*" />
         <exclude name="**/*.jar" />
         <exclude name="**/*.zip" />
         <exclude name="**/.project" />
       </fileset>
-    </zip>
+    </copy>
+    <zip destfile="${basedir}/${ant.project.name}.${version}.src.zip"
+      basedir="${work}/dist/" />
+    <delete dir="${work}/dist/${ant.project.name}.${version}" />
   </target>
 
   <target name="downloadsecurity" if="do.download.security">



Mime
View raw message