diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/build.xml | 39 | ||||
| -rw-r--r-- | java/common.xml | 15 | ||||
| -rw-r--r-- | java/module.xml | 3 |
3 files changed, 42 insertions, 15 deletions
diff --git a/java/build.xml b/java/build.xml index 13633ee25e..d72f92b15c 100644 --- a/java/build.xml +++ b/java/build.xml @@ -107,23 +107,44 @@ <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"> + <mkdir dir="${build.release.prepare}/src/java"/> + <copy todir="${build.release.prepare}/src/java"> <fileset dir=""> + <!-- Module src --> + <include name="**/${bin.dir}/**"/> <include name="**/${src.dir}/**"/> <include name="**/${lib.dir}/**"/> + <include name="**/${etc.dir}/**"/> <include name="**/${module.build.file}"/> + + <!-- Extra Common files --> + <include name="${common.dir}/${stylesheets.dir}/**"/> + <include name="${common.dir}/${resources.dir}/**"/> + + <!-- Root build Files --> <include name="${build.file}"/> <include name="${common.file}"/> <include name="${module.file}"/> <include name="${build.properties.file}"/> + + <!-- Exclude Generated content --> + <exclude name="**/${build.dir}/**"/> + <exclude name="**/${release.dir}/**"/> + </fileset> + </copy> + + <!-- Copy Spec files for protocol generation --> + <copy todir="${build.release.prepare}/src/"> + <fileset dir=".." casesensitive="false"> + <include name="${specs.dir}/**"/> </fileset> </copy> + <!-- Copy Various Txt files to prepare directory --> <copy todir="${build.release.prepare}" > <fileset dir="doc/release-docs"> @@ -131,13 +152,12 @@ <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"/> + + <mkdir dir="${build.release.prepare}/licenses"/> <copy todir="${build.release.prepare}/licenses" > <fileset dir="client/${lib.dir}" casesensitive="false"> @@ -155,19 +175,18 @@ <target name="releasesrc" depends="preparerelease"> - <tar compression="gzip" destfile="${release.dir}/${project.name}-java-${release.fullversion}-src.tar.gz"> + <tar compression="gzip" longfile="gnu" 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}"> + <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> diff --git a/java/common.xml b/java/common.xml index 02c0d2bcfb..51b6f18e01 100644 --- a/java/common.xml +++ b/java/common.xml @@ -23,7 +23,11 @@ <property name="project.namever" value="${project.name}-${project.version}"/> <property name="client.namever" value="${project.name}-client-${project.version}"/> <property name="build.dir" value="${project.root}/build"/> - <!-- <property name="amqp.xml" location="${project.root}/../specs/amqp-8.0.xml"/> --> + <property name="release.dir" value="release"/> + <property name="release.root.dir" value="${project.root}/${release.dir}"/> + + <property name="specs.dir" value="specs"/> + <property name="amqpspec.dir" value="${project.root}/../${specs.dir}"/> <property name="classes.dir" value="classes"/> <property name="src.dir" value="src"/> @@ -31,8 +35,10 @@ <property name="doc.dir" value="doc"/> <property name="etc.dir" value="etc"/> <property name="bin.dir" value="bin"/> + <property name="etc.dir" value="etc"/> + <property name="resources.dir" value="resources"/> + <property name="stylesheets.dir" value="stylesheets"/> <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"/> @@ -51,6 +57,7 @@ <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"/> @@ -66,7 +73,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"/> + <property name="common.dir" value="common"/> + <property name="common.root.dir" value="${project.root}/${common.dir}"/> <mkdir dir="${tasks.classes}"/> <javac srcdir="${tasks.src}" destdir="${tasks.classes}" diff --git a/java/module.xml b/java/module.xml index 924e846bc7..79361a67d8 100644 --- a/java/module.xml +++ b/java/module.xml @@ -19,8 +19,7 @@ <import file="common.xml"/> - - <map property="module" value="${basedir}"> + <map property="module" value="${basedir}" split="${path.separator}"> <globmapper from="${project.root}${file.separator}*" to="*"/> </map> |