Author: nsantos
Date: Mon Mar 24 11:31:04 2008
New Revision: 640503
URL: http://svn.apache.org/viewvc?rev=640503&view=rev
Log:
make build.xml files backward-compatible with ant 1.6.5, by replacing ant 1.7
specific tasks/extensions
Modified:
incubator/qpid/trunk/qpid/java/broker/build.xml
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/client/build.xml
incubator/qpid/trunk/qpid/java/common/build.xml
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/build.xml?rev=640503&r1=640502&r2=640503&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/build.xml Mon Mar 24 11:31:04 2008
@@ -30,9 +30,9 @@
<target name="precompile">
<mkdir dir="${output.dir}"/>
- <javacc target="src/main/grammar/SelectorParser.jj"
- outputdirectory="${output.dir}"
- javacchome="${project.root}/lib"/>
+ <exec executable="javacc">
+ <arg line="-OUTPUT_DIRECTORY=${output.dir}
src/main/grammar/SelectorParser.jj"/>
+ </exec>
</target>
</project>
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=640503&r1=640502&r2=640503&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Mon Mar 24 11:31:04 2008
@@ -33,7 +33,7 @@
<basename property="qpid.jar.name" file="${qpid.jar}"/>
<map property="release.excludes" value="${modules}">
- <regexpmapper from="(.*)" to="\1/**"/>
+ <globmapper from="*" to="*/\*\*"/>
</map>
<property name="release.zip"
location="${release}/${project.namever}.zip"/>
@@ -88,11 +88,16 @@
</target>
<target name="manifest" depends="check-manifest" unless="manifest.done">
- <manifestclasspath property="qpid.jar.classpath" jarfile="${qpid.jar}">
- <classpath>
- <fileset dir="${build.lib}" includes="**/*.jar"
excludes="**/${qpid.jar.name}"/>
- </classpath>
- </manifestclasspath>
+ <path id="class.path">
+ <fileset dir="${build.lib}" >
+ <include name="*.jar"/>
+ <exclude name="${qpid.jar.name}"/>
+ </fileset>
+ </path>
+ <pathconvert property="qpid.jar.classpath" pathsep=":" dirsep="/">
+ <path refid="class.path"/>
+ <map from="${basedir}" to="lib/"/>
+ </pathconvert>
<jar destfile="${qpid.jar}">
<manifest>
Modified: incubator/qpid/trunk/qpid/java/client/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/build.xml?rev=640503&r1=640502&r2=640503&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/build.xml Mon Mar 24 11:31:04 2008
@@ -29,9 +29,9 @@
<target name="precompile">
<mkdir dir="${output.dir}"/>
- <javacc target="src/main/grammar/SelectorParser.jj"
- outputdirectory="${output.dir}"
- javacchome="${project.root}/lib"/>
+ <exec executable="javacc">
+ <arg line="-OUTPUT_DIRECTORY=${output.dir}
src/main/grammar/SelectorParser.jj"/>
+ </exec>
</target>
</project>
Modified: incubator/qpid/trunk/qpid/java/common/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/build.xml?rev=640503&r1=640502&r2=640503&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/build.xml Mon Mar 24 11:31:04 2008
@@ -94,11 +94,11 @@
<target name="version" depends="check-version" if="version.stale">
<!-- Write the version.properties out. -->
- <propertyfile file="${version.file}">
- <entry key="qpid.svnversion" value="${qpid.svnversion}"/>
- <entry key="qpid.name" value="${project.name}"/>
- <entry key="qpid.version" value="${project.version}"/>
- </propertyfile>
+ <echo file="${version.file}" append="true">
+ qpid.svnversion=${qpid.svnversion}
+ qpid.name=${project.name}
+ qpid.version=${project.version}
+ </echo>
</target>
<target name="precompile" depends="gentools,jython,version"/>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=640503&r1=640502&r2=640503&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Mon Mar 24 11:31:04 2008
@@ -235,7 +235,7 @@
<target name="libs" description="copy dependencies into build tree">
<copy todir="${build.lib}" failonerror="false" flatten="true">
- <path refid="module.libs"/>
+ <fileset dir="${basedir}${file.separator}.." includes="${module.libs}"/>
</copy>
</target>
