272 lines
13 KiB
Diff
272 lines
13 KiB
Diff
--- xalan-j_2_7_2/build.xml 2014-03-26 16:21:31.000000000 +0100
|
|
+++ xalan-j_2_7_2/build.xml 2017-10-03 13:58:53.759678877 +0200
|
|
@@ -216,14 +216,12 @@
|
|
<pathelement location="${taglet.jar}" />
|
|
<pathelement location="${build.serializer.jar}" />
|
|
<pathelement location="${build.xalan.jar}" />
|
|
- <pathelement path="${java.class.path}" />
|
|
</path>
|
|
<path id="samples.class.path">
|
|
<pathelement location="${xmlapis.jar}" />
|
|
<pathelement location="${build.serializer.jar}" />
|
|
<pathelement location="${parser.jar}" />
|
|
<pathelement location="${build.xalan.jar}" />
|
|
- <pathelement path="${java.class.path}" />
|
|
</path>
|
|
<path id="compile.class.path">
|
|
<!-- Ensure the selected parser.jar file is used to compile against -->
|
|
@@ -232,7 +230,6 @@
|
|
<pathelement location="${xmlapis.jar}" />
|
|
<pathelement location="${build.serializer.jar}" />
|
|
<pathelement location="${parser.jar}" />
|
|
- <pathelement path="${java.class.path}" />
|
|
</path>
|
|
<path id="xslt.boot.class.path">
|
|
<!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
|
|
@@ -392,7 +389,6 @@
|
|
<exclude name="**/IncrementalSAXSource_Xerces.java"
|
|
unless="xerces.present" />
|
|
<classpath refid="compile.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
</javac>
|
|
<!-- Copy needed properties, resource, etc. files to be put into .jar file -->
|
|
<copy todir="${build.classes}">
|
|
@@ -408,6 +404,12 @@
|
|
<!-- =================================================================== -->
|
|
<target name="xalan-interpretive.compile" depends="xml.compile"
|
|
description="Compile the Xalan interpretive classes (skips XSLTC)" >
|
|
+
|
|
+ <gunzip src="${xml-commons-srcs.tar.gz}" dest="${build.dir}" />
|
|
+ <untar src="${xml-commons-srcs.tar}"
|
|
+ dest="${src.dir}">
|
|
+ </untar>
|
|
+
|
|
<echo message="Compiling Xalan interpretive classes" />
|
|
<javac srcdir="${src.dir}"
|
|
destdir="${build.classes}"
|
|
@@ -418,7 +420,6 @@
|
|
<include name="${xalan.reldir}/**/*.java" />
|
|
<exclude name="${xsltc.reldir}/**/*.java" />
|
|
<classpath refid="compile.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
<sourcepath refid="compile.source.path" />
|
|
</javac>
|
|
<!-- Copy needed properties, resource, etc. files to be put into .jar file -->
|
|
@@ -447,7 +448,6 @@
|
|
<!-- build.classes needed for
|
|
org.apache.xalan.xsltc.util.JavaCupRedirect -->
|
|
<pathelement location="${build.classes}" />
|
|
- <pathelement path="${java.class.path}" />
|
|
</path>
|
|
|
|
<!-- Attempt to determine dependency info for generated sources -->
|
|
@@ -461,7 +461,6 @@
|
|
debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="xsltc.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
</javac>
|
|
<!-- These tricky uptodate statements hopefully determine if we
|
|
actually need to generate the java_cup and jlex files
|
|
@@ -525,7 +524,6 @@
|
|
debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="xsltc.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
</javac>
|
|
</target>
|
|
|
|
@@ -539,7 +537,6 @@
|
|
debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="xsltc.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
</javac>
|
|
</target>
|
|
|
|
@@ -738,90 +735,90 @@
|
|
<!-- Since the samples are packageless, they must be compiled separately. -->
|
|
<javac srcdir="${samples.dir}/SimpleTransform"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/UseStylesheetPI"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/UseStylesheetParam"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/SAX2SAX"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/DOM2DOM"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/Pipe"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
|
|
+ debug="${build.debug}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/UseXMLFilters"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/Trace"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/ApplyXPath"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/ApplyXPathDOM"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/trax"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/extensions"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/Validate"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/TransformThread"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
<javac srcdir="${samples.dir}/XPathAPI"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
</javac>
|
|
@@ -864,7 +861,7 @@
|
|
<javac srcdir="${samples.dir}/servlet"
|
|
destdir="${build.servlet}/WEB-INF/classes"
|
|
debug="${build.debug}"
|
|
- bootclasspathref="xslt.boot.class.path"
|
|
+
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath refid="samples.class.path" />
|
|
<classpath location="${servlet-api.jar}" />
|
|
@@ -904,13 +901,13 @@
|
|
<target name="xsltc.samples.nojardepends">
|
|
<mkdir dir="${build.samples}"/>
|
|
<javac srcdir="${samples.dir}/translets"
|
|
- classpath="${java.class.path}:${build.xalan.jar}"
|
|
+ classpath="${build.xalan.jar}"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}"/>
|
|
<javac srcdir="${samples.dir}/CompiledJAXP"
|
|
destdir="${build.samples}" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}"/>
|
|
</target>
|
|
|
|
@@ -923,7 +920,7 @@
|
|
<mkdir dir="${build.samples}/CompiledApplet"/>
|
|
<javac srcdir="${samples.dir}/CompiledApplet"
|
|
destdir="${build.samples}/CompiledApplet" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}"/>
|
|
<jar jarfile="${build.xsltc.applet.jar}"
|
|
basedir="${build.samples}/CompiledApplet"
|
|
@@ -939,7 +936,7 @@
|
|
<mkdir dir="${build.samples}/CompiledBrazil"/>
|
|
<javac srcdir="${samples.dir}/CompiledBrazil"
|
|
destdir="${build.samples}/CompiledBrazil" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath location="${brazil.jar}"/>
|
|
</javac>
|
|
@@ -959,7 +956,7 @@
|
|
<mkdir dir="${build.samples}/CompiledEJB"/>
|
|
<javac srcdir="${samples.dir}/CompiledEJB"
|
|
destdir="${build.samples}/CompiledEJB" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath location="${javaee-api.jar}"/>
|
|
</javac>
|
|
@@ -977,7 +974,7 @@
|
|
<mkdir dir="${build.samples}/CompiledServlet"/>
|
|
<javac srcdir="${samples.dir}/CompiledServlet"
|
|
destdir="${build.samples}/CompiledServlet" excludes="${exclude}"
|
|
- debug="${build.debug}" bootclasspathref="xslt.boot.class.path"
|
|
+ debug="${build.debug}"
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<classpath location="${servlet-api.jar}"/>
|
|
</javac>
|
|
@@ -1554,7 +1551,7 @@
|
|
<!-- Use FOP to generate a pdf file (classpath may need updating! -sc 18-Apr-01)-->
|
|
<java fork="yes"
|
|
classname="org.apache.fop.apps.CommandLine"
|
|
- classpath="${java.class.path}:${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
|
|
+ classpath="${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar">
|
|
<arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
|
|
</java>
|
|
</target>
|
|
@@ -1690,7 +1687,6 @@
|
|
target="${compiler.target}" source="${compiler.source}">
|
|
<include name="${serializer.reldir}/**/*.java" />
|
|
<classpath refid="compile.class.path" />
|
|
- <bootclasspath refid="xslt.boot.class.path" />
|
|
</javac>
|
|
<!-- Copy needed properties, resource, etc. files to be put into .jar file -->
|
|
<copy todir="${serializer.build.classes}">
|