[patch] patch to fix build.xml to explicitly specify the source and target for javac

xalan-jdk15.patch (text/plain), 9.91 KB, created by Mikko Tiihonen on 2004-12-08 10:45:52 UTC

--- build.xml.orig	2004-12-08 20:30:23.568163145 +0200
+++ build.xml	2004-12-08 20:30:52.081632787 +0200
@@ -56,6 +56,9 @@
        location properties to make it simpler to reset these values; 
        please provide feedback if this is useful. 
   -->
+  <property name="javac.target" value="1.3"/>
+  <property name="javac.source" value="${javac.target}"/>
+
   <property name="xmlapis.jar.name" value="xml-apis.jar"/>
   <property name="xmlapis.jar" value="${bin.dir}/${xmlapis.jar.name}"/>
   <property name="parser.jar.name" value="xercesImpl.jar"/>
@@ -184,6 +187,7 @@
     <!-- Set build.boot.class.path to a JDK 1.1.x classes.zip file to check
          compatibility with 1.1.x.  If you omit this property, compatability
          with 1.1.x will not be checked even though javac specifies a target of 1.1 -->
+    <pathelement path="${xmlapis.jar}"/>
     <pathelement location="${build.classes}" />
     <pathelement path="${build.boot.class.path}" />
     <pathelement path="${sun.boot.class.path}" />
@@ -253,7 +257,7 @@
     <javac srcdir="${src.dir}"
            destdir="${build.classes}"
            debug="${build.debug}"
-           target="1.1" >
+           target="${javac.target}" source="${javac.source}" >
       <include name="${apachexml.reldir}/**/*.java" />
       <!-- But exclude unused synthetic* files; should be obsoleted from CVS -->
       <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" />      
@@ -277,7 +281,7 @@
     <javac srcdir="${src.dir}" 
            destdir="${build.classes}"
            debug="${build.debug}" 
-           target="1.1" >
+           target="${javac.target}" source="${javac.source}" >
       <include name="${xpath.reldir}/**/*.java" />
       <include name="${domxpath.reldir}/**/*.java" />
       <include name="${xalan.reldir}/**/*.java" />
@@ -322,6 +326,7 @@
     <javac srcdir="${src.dir}" 
            destdir="${build.classes}"
            includes="${xsltc.reldir}/util/**/*.java"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}">
       <classpath refid="xsltc.class.path" />
       <bootclasspath refid="xslt.boot.class.path" />
@@ -384,6 +389,7 @@
     <javac srcdir="${src.dir}" 
            destdir="${build.classes}"
            includes="${xsltc.reldir}/**/*.java"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}">
       <classpath refid="xsltc.class.path" />
       <bootclasspath refid="xslt.boot.class.path" />
@@ -397,6 +403,7 @@
     <javac srcdir="${src.dir}" 
            destdir="${build.classes}"
            includes="${xsltc.reldir}/**/*.java"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}">
       <classpath refid="xsltc.class.path" />
       <bootclasspath refid="xslt.boot.class.path" />
@@ -598,71 +605,85 @@
     <!-- Since the samples are packageless, they must be compiled separately. -->   
     <javac srcdir="${samples.dir}/SimpleTransform" 
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseStylesheetPI"   
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseStylesheetParam" 
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/SAX2SAX"  
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/DOM2DOM"  
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Pipe"  
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/UseXMLFilters"  
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Trace"   
            destdir="${build.samples}"  excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/ApplyXPath"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>
     <javac srcdir="${samples.dir}/ApplyXPathDOM"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>             
     <javac srcdir="${samples.dir}/trax"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/extensions"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
     <javac srcdir="${samples.dir}/Validate"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac> 
     <javac srcdir="${samples.dir}/TransformThread"  
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
       <classpath refid="samples.class.path" />
     </javac>           
@@ -705,6 +726,7 @@
      <javac srcdir="${samples.dir}/servlet"
             destdir="${build.servlet}/WEB-INF/classes"
             debug="${build.debug}"
+            target="${javac.target}" source="${javac.source}"
             bootclasspathref="xslt.boot.class.path" >
        <classpath refid="samples.class.path" />
      </javac>           
@@ -745,9 +767,11 @@
     <javac srcdir="${samples.dir}/translets"
            classpath="${java.class.path}:${build.xalan.jar}" 
            destdir="${build.samples}" excludes="${exclude}" 
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
     <javac srcdir="${samples.dir}/CompiledJAXP"
            destdir="${build.samples}" excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
   </target>
 
@@ -760,6 +784,7 @@
     <mkdir dir="${build.samples}/CompiledApplet"/>
     <javac srcdir="${samples.dir}/CompiledApplet"
            destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
     <jar jarfile="${build.xsltc.applet.jar}"
          basedir="${build.samples}/CompiledApplet"
@@ -775,6 +800,7 @@
     <mkdir dir="${build.samples}/CompiledBrazil"/>
     <javac srcdir="${samples.dir}/CompiledBrazil"
            destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
     <jar jarfile="${build.xsltc.brazil.jar}"
          basedir="${build.samples}/CompiledBrazil"
@@ -792,6 +818,7 @@
     <mkdir dir="${build.samples}/CompiledEJB"/>
     <javac srcdir="${samples.dir}/CompiledEJB"
            destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
     <jar jarfile="${build.xsltc.ejb.jar}"
          basedir="${build.samples}/CompiledEJB"
@@ -807,6 +834,7 @@
     <mkdir dir="${build.samples}/CompiledServlet"/>
     <javac srcdir="${samples.dir}/CompiledServlet"
            destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
+           target="${javac.target}" source="${javac.source}"
            debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
     <jar jarfile="${build.xsltc.servlet.jar}"
          basedir="${build.samples}/CompiledServlet"