diff options
| -rw-r--r-- | java/build.properties | 3 | ||||
| -rw-r--r-- | java/build.xml | 72 | ||||
| -rw-r--r-- | java/common.xml | 13 | ||||
| -rw-r--r-- | java/doc/Release Docs/LICENSE.txt | 0 | ||||
| -rw-r--r-- | java/doc/Release Docs/NOTICE.txt | 0 | ||||
| -rw-r--r-- | java/doc/Release Docs/README.txt | 0 | ||||
| -rw-r--r-- | java/doc/Release Docs/RELEASE_NOTES.txt | 0 |
7 files changed, 85 insertions, 3 deletions
diff --git a/java/build.properties b/java/build.properties new file mode 100644 index 0000000000..618a001cc9 --- /dev/null +++ b/java/build.properties @@ -0,0 +1,3 @@ +build.release.version=1.0 +build.release.name=incubator +build.release.tag=M1
\ No newline at end of file diff --git a/java/build.xml b/java/build.xml index c2e897e006..5dc7eb712b 100644 --- a/java/build.xml +++ b/java/build.xml @@ -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/**"/> @@ -102,4 +105,71 @@ <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> diff --git a/java/common.xml b/java/common.xml index aa3fe81b9e..02c0d2bcfb 100644 --- a/java/common.xml +++ b/java/common.xml @@ -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" diff --git a/java/doc/Release Docs/LICENSE.txt b/java/doc/Release Docs/LICENSE.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/java/doc/Release Docs/LICENSE.txt diff --git a/java/doc/Release Docs/NOTICE.txt b/java/doc/Release Docs/NOTICE.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/java/doc/Release Docs/NOTICE.txt diff --git a/java/doc/Release Docs/README.txt b/java/doc/Release Docs/README.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/java/doc/Release Docs/README.txt diff --git a/java/doc/Release Docs/RELEASE_NOTES.txt b/java/doc/Release Docs/RELEASE_NOTES.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/java/doc/Release Docs/RELEASE_NOTES.txt |