svn commit: r719475 - /xerces/java/trunk/build.xml

[mrglavas]

Author: mrglavas
Date: Thu Nov 20 20:54:50 2008
New Revision: 719475

URL: http://svn.apache.org/viewvc?rev=719475&view=rev
Log:
When executing the (x)javac task explicitly specify the source and target level.
Both of these values will be equal to the java version used for invoking Ant.
Previously we were relying on default values; target was 1.1 for JDK 1.3 and
1.2 for JDK 1.4.

Modified:
    xerces/java/trunk/build.xml

Modified: xerces/java/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/build.xml?rev=719475&r1=719474&r2=719475&view=diff
==============================================================================
--- xerces/java/trunk/build.xml (original)
+++ xerces/java/trunk/build.xml Thu Nov 20 20:54:50 2008
@@ -85,6 +85,9 @@
     <property name="debug" value="off"/>
     <property name="optimize" value="on"/>
     <property name="deprecation" value="off"/>
+       
+    <property name="javac.source" value="${ant.java.version}"/>
+    <property name="javac.target" value="${ant.java.version}"/>
 
     <property name="docs.book" value="${docs.dir}/docs-book.xml"/>
 
@@ -257,6 +260,8 @@
 
     <xjavac srcdir="${build.src}"
            destdir="${build.dest}"
+           source="${javac.source}"
+           target="${javac.target}"
            
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
            debug="${debug}"
            deprecation="${deprecation}"
@@ -320,6 +325,8 @@
     </copy>
     <xjavac srcdir="${build.samples}"
            destdir="${build.dest}"
+           source="${javac.source}"
+           target="${javac.target}"
            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
            debug="${debug}"
            includeAntRuntime="false"
@@ -337,6 +344,8 @@
     </copy>
     <xjavac srcdir="${build.tests}"
            destdir="${build.dest}"
+           source="${javac.source}"
+           target="${javac.target}"
            
classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
            debug="${debug}"
            includeAntRuntime="false"
@@ -960,6 +969,8 @@
 
     <xjavac srcdir="${build.src}"
            destdir="${build.dest}"
+           source="${javac.source}"
+           target="${javac.target}"
            debug="${debug}"
            deprecation="${deprecation}"
            optimize="${optimize}"
@@ -1257,7 +1268,9 @@
 
     <xjavac srcdir="${build.src}"
            destdir="${build.dest}"
-          classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+           source="${javac.source}"
+           target="${javac.target}"
+           classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
            debug="${debug}"
            deprecation="${deprecation}"
            optimize="${optimize}"
@@ -1405,6 +1418,8 @@
 
         <xjavac srcdir="${build.src}"
                destdir="${build.dest}"
+               source="${javac.source}"
+               target="${javac.target}"
                
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
                debug="${debug}"
                deprecation="${deprecation}"
@@ -1476,6 +1491,8 @@
        
     <javac srcdir="${build.src}"
            destdir="${build.dest}"
+           source="${javac.source}"
+           target="${javac.target}"
            
classpath="${build.dir}/classes:${tools.dir}/${jar.ant}:${tools.dir}/${jar.ant.nodeps}"
            debug="${debug}"
            deprecation="${deprecation}"



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]