diff options
| -rwxr-xr-x | gentools/build | 2 | ||||
| -rw-r--r-- | gentools/build.xml | 37 | ||||
| -rw-r--r-- | java/build.xml | 1 | ||||
| -rw-r--r-- | java/common.xml | 7 | ||||
| -rw-r--r-- | java/module.xml | 11 |
5 files changed, 40 insertions, 18 deletions
diff --git a/gentools/build b/gentools/build index ad9827b113..4114babe72 100755 --- a/gentools/build +++ b/gentools/build @@ -8,7 +8,7 @@ for f in org/apache/qpid/gentools/*.class; do 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 ----------" diff --git a/gentools/build.xml b/gentools/build.xml index 6006c2bcf8..8da6e7b49f 100644 --- a/gentools/build.xml +++ b/gentools/build.xml @@ -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> diff --git a/java/build.xml b/java/build.xml index 15844cac1a..d639ae0e34 100644 --- a/java/build.xml +++ b/java/build.xml @@ -158,6 +158,7 @@ <iterate target="clean"/> <delete dir="${build}"/> <delete dir="${release}"/> + <delete dir="${tasks.classes}"/> </target> </project> diff --git a/java/common.xml b/java/common.xml index 8d61880714..6bed2afbc9 100644 --- a/java/common.xml +++ b/java/common.xml @@ -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}"/> diff --git a/java/module.xml b/java/module.xml index 42385e3f53..df0572a48b 100644 --- a/java/module.xml +++ b/java/module.xml @@ -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}"/> |