You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2006/07/20 19:03:04 UTC
svn commit: r423987 - /incubator/abdera/java/trunk/build/build.xml
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">
Re: svn commit: r423987 - /incubator/abdera/java/trunk/build/build.xml
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/20/06, James M Snell <ja...@gmail.com> wrote:
> No, I fixed it in a later check in.
Yeah, I noticed right after I sent the mail.
That'll teach me to reply before I get to all the messages ;-)
-garrett
Re: svn commit: r423987 - /incubator/abdera/java/trunk/build/build.xml
Posted by James M Snell <ja...@gmail.com>.
No, I fixed it in a later check in.
- James
Garrett Rooney wrote:
> On 7/20/06, jmsnell@apache.org <jm...@apache.org> wrote:
>> 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" />
>
> Did you intend to change the json stuff here?
>
> -garrett
>
Re: svn commit: r423987 - /incubator/abdera/java/trunk/build/build.xml
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 7/20/06, jmsnell@apache.org <jm...@apache.org> wrote:
> 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" />
Did you intend to change the json stuff here?
-garrett