Author: ritchiem
Date: Wed Nov 8 09:45:54 2006
New Revision: 472561
URL: http://svn.apache.org/viewvc?view=rev&rev=472561
Log:
QPID-74
Update to ant build system to generate source distribution.
The source distribution includes ALL Libs this is obviously not quite right. As
we need to exclude those jars that are not compatible.
Added:
incubator/qpid/trunk/qpid/java/build.properties (with props)
incubator/qpid/trunk/qpid/java/doc/Release Docs/
incubator/qpid/trunk/qpid/java/doc/Release Docs/LICENSE.txt (with props)
incubator/qpid/trunk/qpid/java/doc/Release Docs/NOTICE.txt (with props)
incubator/qpid/trunk/qpid/java/doc/Release Docs/README.txt (with props)
incubator/qpid/trunk/qpid/java/doc/Release Docs/RELEASE_NOTES.txt (with
props)
Modified:
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/common.xml
Added: incubator/qpid/trunk/qpid/java/build.properties
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.properties?view=auto&rev=472561
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.properties (added)
+++ incubator/qpid/trunk/qpid/java/build.properties Wed Nov 8 09:45:54 2006
@@ -0,0 +1,3 @@
+build.release.version=1.0
+build.release.name=incubator
+build.release.tag=M1
\ No newline at end of file
Propchange: incubator/qpid/trunk/qpid/java/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?view=diff&rev=472561&r1=472560&r2=472561
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Wed Nov 8 09:45:54 2006
@@ -25,6 +25,8 @@
<property name="modules"
value="${modules.client},broker,broker/test,client/test,management/core,management/cli,cluster,${modules.extra}"/>
+ <property name="release.fullversion"
value="${build.release.version}-${build.release.name}-${build.release.tag}"/>
+
<macrodef name="iterate">
<attribute name="target"/>
<attribute name="modules" default="${modules}"/>
@@ -47,7 +49,7 @@
<target name="testreport" description="execute unit tests and produce
reports">
<iterate target="testreport"/>
- </target>
+ </target>
<target name="doc" description="produce javadoc for each module">
<iterate target="doc"/>
@@ -69,6 +71,7 @@
<target name="clean" description="remove all build artifacts">
<iterate target="clean"/>
<delete dir="${build.dir}"/>
+ <delete dir="${release.dir}"/>
</target>
<property name="client.includes" value="*/client/**"/>
@@ -101,5 +104,72 @@
<target name="archive" depends="zip,gzip,bzip2"
description="produce all archive formats of the distribution tree"/>
+
+
+ <target name="preparerelease">
+ <mkdir dir="${build.release.prepare}/src"/>
+ <mkdir dir="${release.dir}"/>
+
+ <!-- Copy Source to prepare directory -->
+ <mkdir dir="${build.release.prepare}/src"/>
+ <copy todir="${build.release.prepare}/src">
+ <fileset dir="">
+ <include name="**/${src.dir}/**"/>
+ <include name="**/${lib.dir}/**"/>
+ <include name="**/${module.build.file}"/>
+ <include name="${build.file}"/>
+ <include name="${common.file}"/>
+ <include name="${module.file}"/>
+ <include name="${build.properties.file}"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy Various Txt files to prepare directory -->
+ <copy todir="${build.release.prepare}" >
+ <fileset dir="doc/Release Docs">
+ <include name="LICENSE.txt"/>
+ <include name="README.txt"/>
+ <include name="NOTICE.txt"/>
+ <include name="RELEASE_NOTES.txt"/>
+ <exclude name="${build.dir}"/>
+ <exclude name="${release.dir}"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy all licenses to license directory -->
+ <mkdir dir="${build.release.prepare}/licenses"/>
+
+ <copy todir="${build.release.prepare}/licenses" >
+ <fileset dir="client/${lib.dir}" casesensitive="false">
+ <include name="**/license.txt"/>
+ </fileset>
+ <fileset dir="broker/${lib.dir}" casesensitive="false">
+ <include name="**/license.txt"/>
+ </fileset>
+ <fileset dir="common/${lib.dir}" casesensitive="false">
+ <include name="**/license.txt"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="releasesrc" depends="preparerelease">
+
+ <tar compression="gzip"
destfile="${release.dir}/${project.name}-java-${release.fullversion}-src.tar.gz">
+ <tarfileset dir="${build.release.prepare}" mode="755" username="ant"
group="ant">
+ <include name="**"/>
+ </tarfileset>
+ </tar>
+
+ <zip
destfile="${release.dir}/${project.name}-java-${release.fullversion}-src.zip">
+ <zipfileset dir="${build.release.prepare}">
+ <include name="**"/>
+ </zipfileset>
+ </zip>
+
+ <delete dir="${build.release.prepare}"/>
+ </target>
+
+
</project>
Modified: incubator/qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common.xml?view=diff&rev=472561&r1=472560&r2=472561
==============================================================================
--- incubator/qpid/trunk/qpid/java/common.xml (original)
+++ incubator/qpid/trunk/qpid/java/common.xml Wed Nov 8 09:45:54 2006
@@ -32,6 +32,7 @@
<property name="etc.dir" value="etc"/>
<property name="bin.dir" value="bin"/>
<property name="src.bin" value="${bin.dir}"/>
+ <property name="release.dir" value="release"/>
<property name="launcher.sfx" value="-launch.jar"/>
<property name="dist.root" value="${build.dir}/dist"/>
@@ -42,6 +43,14 @@
<property name="dist.doc" value="${dist.dir}/${doc.dir}"/>
<property name="dist.etc" value="${dist.dir}/${etc.dir}"/>
+ <property name="module.build.file" value="build-module.xml"/>
+ <property name="build.file" value="build.xml"/>
+ <property name="module.file" value="module.xml"/>
+ <property name="common.file" value="common.xml"/>
+ <property name="build.properties.file" value="build.properties"/>
+ <property name="build.release" value="${build.dir}/${release.dir}"/>
+ <property name="build.release.prepare"
value="${build.dir}/${release.dir}/prepare"/>
+
<property name="build.zip" value="${build.dir}/${project.namever}.zip"/>
<property name="build.tar" value="${build.dir}/${project.namever}.tar"/>
<property name="build.tgz" value="${build.dir}/${project.namever}.tar.gz"/>
@@ -57,9 +66,9 @@
<property name="tasks.dir" value="${project.root}/tasks"/>
<property name="tasks.classes" value="${tasks.dir}/classes"/>
- <property name="tasks.src" value="${tasks.dir}/src"/>
+ <property name="tasks.src" value="${tasks.dir}/src"/>
- <mkdir dir="${tasks.classes}"/>
+ <mkdir dir="${tasks.classes}"/>
<javac srcdir="${tasks.src}" destdir="${tasks.classes}"
classpath="${java.class.path}"/>
<taskdef name="map" classname="org.apache.qpid.tasks.Map"
Added: incubator/qpid/trunk/qpid/java/doc/Release Docs/LICENSE.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/doc/Release%20Docs/LICENSE.txt?view=auto&rev=472561
==============================================================================
(empty)
Propchange: incubator/qpid/trunk/qpid/java/doc/Release Docs/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/qpid/trunk/qpid/java/doc/Release Docs/NOTICE.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/doc/Release%20Docs/NOTICE.txt?view=auto&rev=472561
==============================================================================
(empty)
Propchange: incubator/qpid/trunk/qpid/java/doc/Release Docs/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/qpid/trunk/qpid/java/doc/Release Docs/README.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/doc/Release%20Docs/README.txt?view=auto&rev=472561
==============================================================================
(empty)
Propchange: incubator/qpid/trunk/qpid/java/doc/Release Docs/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/qpid/trunk/qpid/java/doc/Release Docs/RELEASE_NOTES.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/doc/Release%20Docs/RELEASE_NOTES.txt?view=auto&rev=472561
==============================================================================
(empty)
Propchange: incubator/qpid/trunk/qpid/java/doc/Release Docs/RELEASE_NOTES.txt
------------------------------------------------------------------------------
svn:eol-style = native
