You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/11/16 15:41:42 UTC
svn commit: r475752 - /incubator/qpid/branches/M1/java/build.xml
Author: ritchiem
Date: Thu Nov 16 06:41:41 2006
New Revision: 475752
URL: http://svn.apache.org/viewvc?view=rev&rev=475752
Log:
Applied build.xml trunk merge
Modified:
incubator/qpid/branches/M1/java/build.xml
Modified: incubator/qpid/branches/M1/java/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M1/java/build.xml?view=diff&rev=475752&r1=475751&r2=475752
==============================================================================
--- incubator/qpid/branches/M1/java/build.xml (original)
+++ incubator/qpid/branches/M1/java/build.xml Thu Nov 16 06:41:41 2006
@@ -113,7 +113,7 @@
</target>
<target name="copymodule">
- <copy todir="${build.release.prepare}/src/java">
+ <copy todir="${todir}">
<fileset dir="${project.root}">
<!-- Module src -->
<include name="${module}/${bin.dir}/**"/>
@@ -128,33 +128,45 @@
<target name="preparereleasesrc" depends="preparerelease">
+ <property name="release.src.dir" value="${build.release.dir}/src"/>
+ <property name="release.java.src.dir" value="${build.release.dir}/src/java"/>
+
<!-- Copy Source to prepare directory -->
- <mkdir dir="${build.release.prepare}/src/java"/>
+ <mkdir dir="${release.java.src.dir}"/>
<antcall target="copymodule">
<param name="module" value="broker"/>
+ <param name="todir" value="${release.java.src.dir}"/>
</antcall>
<antcall target="copymodule">
<param name="module" value="client"/>
+ <param name="todir" value="${release.java.src.dir}"/>
</antcall>
<antcall target="copymodule">
<param name="module" value="common"/>
+ <param name="todir" value="${release.java.src.dir}"/>
</antcall>
<antcall target="copymodule">
<param name="module" value="cluster"/>
+ <param name="todir" value="${release.java.src.dir}"/>
+ </antcall>
+
+ <antcall target="copymodule">
+ <param name="module" value="systests"/>
+ <param name="todir" value="${release.java.src.dir}"/>
</antcall>
- <copy todir="${build.release.prepare}/src/java">
+ <copy todir="${release.java.src.dir}">
<fileset dir="${project.root}">
<include name="${tasks.dir}/${src.dir}/**"/>
<include name="${doc.dir}/**"/>
</fileset>
</copy>
- <copy todir="${build.release.prepare}/src/java">
+ <copy todir="${release.java.src.dir}">
<fileset dir="${project.root}">
<!-- Module src -->
<!-- Extra Common files -->
@@ -171,14 +183,14 @@
</copy>
<!-- Copy Spec files for protocol generation -->
- <copy todir="${build.release.prepare}/src/">
+ <copy todir="${release.src.dir}">
<fileset dir=".." casesensitive="false">
<include name="${specs.dir}/**"/>
</fileset>
</copy>
<antcall target="copyreleasedocs">
- <param name="todir" value="${build.release.prepare}"/>
+ <param name="todir" value="${build.release.dir}"/>
</antcall>
</target>
@@ -193,6 +205,9 @@
<include name="README.txt"/>
<include name="NOTICE.txt"/>
</fileset>
+ <fileset dir="${resources.root.dir}/META-INF">
+ <include name="DISCLAIMER.txt"/>
+ </fileset>
</copy>
<antcall target="createLicense">
@@ -234,23 +249,33 @@
<target name="tgzandzip">
<tar compression="gzip" longfile="gnu"
destfile="${file}.tar.gz">
- <tarfileset dir="${source}" mode="755" username="ant" group="ant">
- <include name="**"/>
+ <tarfileset dir="${path}" mode="755" username="ant" group="ant">
+ <include name="${source}/**"/>
</tarfileset>
</tar>
<zip destfile="${file}.zip">
- <zipfileset dir="${source}">
- <include name="**"/>
+ <zipfileset dir="${path}">
+ <include name="${source}/**"/>
</zipfileset>
</zip>
</target>
- <target name="std-src-release" depends="preparereleasesrc">
+ <target name="std-src-release" >
+
+ <!-- Setup the local variables -->
+ <property name="release.src.name" value="${project.name}-java-${release.fullversion}-src"/>
+ <property name="build.release.src.dir" value="${build.release}/${release.src.name}"/>
+
+ <antcall target="preparereleasesrc">
+ <param name="release.src.name" value="${release.src.name}"/>
+ <param name="build.release.dir" value="${build.release.src.dir}"/>
+ </antcall>
<antcall target="tgzandzip">
- <param name="file" value="${release.dir}/${project.name}-java-${release.fullversion}-src"/>
- <param name="source" value="${build.release.prepare}"/>
+ <param name="file" value="${release.dir}/${release.src.name}"/>
+ <param name="path" value="${build.release}"/>
+ <param name="source" value="${release.src.name}"/>
</antcall>
</target>
@@ -258,7 +283,7 @@
<target name="std-bin-release" depends="preparerelease">
<antcall target="std-bin-release-item">
- <param name="module.content" value="client-server"/>
+ <param name="module.content" value="client-broker"/>
</antcall>
<antcall target="std-bin-release-item">
@@ -276,8 +301,6 @@
-->
<target name="std-bin-release-item" depends="preparerelease">
- <property name="release.client.bin.dir" value="${build.release}/${project.name}-java-${release.fullversion}-client"/>
-
<!-- if modules.include has not been set set it to all modules-->
<property name="modules.include" value="${modules}"/>
@@ -287,15 +310,15 @@
</condition>
<!-- If the module content has been specified then use then set that value-->
- <condition property="module.content.suffix" value="-${module.content}" else="">
+ <condition property="module.release.suffix" value="-bin-${module.content}" else="">
<isset property="module.content"/>
</condition>
<!-- Setup the local variables -->
- <property name="release.name" value="${project.name}-java-${release.fullversion}${module.content.suffix}"/>
- <property name="release.bin.dir" value="${build.release}/${release.name}"/>
+ <property name="release.bin.name" value="${project.name}-java-${release.fullversion}${module.release.suffix}"/>
+ <property name="release.bin.dir" value="${build.release}/${release.bin.name}"/>
<property name="module.jar.prefix" value="${project.name}-"/>
- <property name="module.jar.suffix" value="-${release.fullversion}${module.content.suffix}"/>
+ <property name="module.jar.suffix" value="-${release.fullversion}"/>
<mkdir dir="${release.bin.dir}"/>
@@ -312,8 +335,9 @@
<mkdir dir="${release.bin.dir}/${log.dir}"/>
<antcall target="tgzandzip">
- <param name="file" value="${release.dir}/${release.name}-bin"/>
- <param name="source" value="${release.bin.dir}"/>
+ <param name="file" value="${release.dir}/${release.bin.name}"/>
+ <param name="path" value="${build.release}"/>
+ <param name="source" value="${release.bin.name}"/>
</antcall>
</target>