Author: ritchiem
Date: Tue Jul 15 04:36:41 2008
New Revision: 676884
URL: http://svn.apache.org/viewvc?rev=676884&view=rev
Log:
QPID-1176 : Updated Tasks and gentools build to use the java.source and
java.target values. Added echo statements to show the targeted build Updated
other info echo statements to be an info level so they will not print with -q.
Modified:
incubator/qpid/trunk/qpid/gentools/build
incubator/qpid/trunk/qpid/gentools/build.xml
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/common.xml
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/gentools/build
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/build?rev=676884&r1=676883&r2=676884&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/build (original)
+++ incubator/qpid/trunk/qpid/gentools/build Tue Jul 15 04:36:41 2008
@@ -8,7 +8,7 @@
fi
done
echo "Compiling..."
-javac org/apache/qpid/gentools/*.java
+javac -source=1.5 -target=1.5 org/apache/qpid/gentools/*.java
echo "Done. Try it out..."
java org.apache.qpid.gentools.Main
echo "--------- Building gentools completed ----------"
Modified: incubator/qpid/trunk/qpid/gentools/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/gentools/build.xml?rev=676884&r1=676883&r2=676884&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/gentools/build.xml (original)
+++ incubator/qpid/trunk/qpid/gentools/build.xml Tue Jul 15 04:36:41 2008
@@ -19,23 +19,34 @@
-
-->
<project name="gentools" default="compile">
- <property name="src" location="src" />
+ <property name="src" location="src" />
- <target name="compile">
- <javac srcdir="${src}" source="1.5" fork="true" debug="on">
- <classpath>
- <fileset dir="${src}/../lib">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <!--condition property="java.target" value="${java.target}" else="1.5">
+ <isset property="java.target"/>
+ </condition>
- </javac>
+ <condition property="java.source" value="${java.source}" else="1.5">
+ <isset property="java.source"/>
+ </condition-->
+
+ <property name="java.source" value="1.5"/>
+ <property name="java.target" value="1.5"/>
+
+
+ <target name="compile">
+ <javac srcdir="${src}" source="${java.source}" target="${java.target}"
fork="true" debug="on">
+ <classpath>
+ <fileset dir="${src}/../lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ </javac>
</target>
- <target name="clean">
- <delete>
- <fileset dir="${src}/org/apache/qpid/gentools"
includes="*.class" />
- </delete>
+ <target name="clean">
+ <delete>
+ <fileset dir="${src}/org/apache/qpid/gentools" includes="*.class"
/>
+ </delete>
</target>
</project>
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=676884&r1=676883&r2=676884&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Tue Jul 15 04:36:41 2008
@@ -158,6 +158,7 @@
<iterate target="clean"/>
<delete dir="${build}"/>
<delete dir="${release}"/>
+ <delete dir="${tasks.classes}"/>
</target>
</project>
Modified: incubator/qpid/trunk/qpid/java/common.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common.xml?rev=676884&r1=676883&r2=676884&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common.xml (original)
+++ incubator/qpid/trunk/qpid/java/common.xml Tue Jul 15 04:36:41 2008
@@ -47,6 +47,8 @@
<property name="tasks.classes" location="${tasks}/classes"/>
<property name="tasks.src" location="${tasks}/src"/>
+ <property name="javac.compiler.args" value=""/>
+
<macrodef name="indirect">
<attribute name="name"/>
<attribute name="variable"/>
@@ -75,8 +77,9 @@
</macrodef>
<mkdir dir="${tasks.classes}"/>
- <javac srcdir="${tasks.src}" destdir="${tasks.classes}"
- classpath="${java.class.path}"/>
+ <javac source="${java.source}" target="${java.target}" srcdir="${tasks.src}"
destdir="${tasks.classes}" classpath="${java.class.path}">
+ <compilerarg line="${javac.compiler.args}"/>
+ </javac>
<taskdef name="map" classname="org.apache.qpid.tasks.Map"
classpath="${tasks.classes}"/>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=676884&r1=676883&r2=676884&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Tue Jul 15 04:36:41 2008
@@ -26,7 +26,7 @@
<globmapper from="${project.root}${file.separator}*" to="*"/>
</map>
- <echo message="Running ant for module : ${module}"/>
+ <echo message="Running ant for module : ${module}" level="info"/>
<property file="${project.root}/build.deps"/>
@@ -142,9 +142,13 @@
<target name="precompile"/>
<target name="compile" depends="prepare,precompile" description="compile
sources">
- <javac source="${java.source}" target="${java.target}"
+
+ <echo message="Targeting : ${java.target}" level="info"/>
+
+ <javac source="${java.source}" target="${java.target}"
destdir="${module.classes}" debug="on"
deprecation="${javac.deprecation}">
+ <compilerarg line="${javac.compiler.args}"/>
<src refid="module.src.path"/>
<classpath refid="module.class.path"/>
</javac>
@@ -199,10 +203,13 @@
<delete file="${module.failed}"/>
+ <echo message="Using config:${config}" level="info"/>
<junit fork="${test.fork}" maxmemory="${test.mem}" reloading="no"
haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
failureproperty="test.failures" printsummary="on" timeout="600000" >
+ <jvmarg value="${jvm.args}"/>
+
<sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
<sysproperty key="root.logging.level" value="${root.logging.level}"/>
<sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
