Made changes in order to get xalan27.jar to build properly in the

snapshot and release build environments.

diff --git a/xsl/extensions/.cvsignore b/xsl/extensions/.cvsignore
index 373fb315419368fd343e20949567cfbf4ed1a54e..ac3f8e40b4a0cd0efecebadfc517217fac4d9d4c 100644 (file)
--- a/xsl/extensions/.cvsignore
+++ b/xsl/extensions/.cvsignore
@@ -1,3 +1,4 @@
 doc
 *.jar
 build
+build2

diff --git a/xsl/extensions/Makefile b/xsl/extensions/Makefile
index 61be0b1443b81af336753b95e75e2bce5d8e7542..1e2443f268f5afaabce8d350e5d541d59a1bbc18 100644 (file)
--- a/xsl/extensions/Makefile
+++ b/xsl/extensions/Makefile
@@ -16,15 +16,19 @@ saxon643.jar: build/lib/docbook-xsl-saxon.jar
 xalan25.jar: build/lib/docbook-xsl-xalan.jar
        cp build/lib/docbook-xsl-xalan.jar xalan25.jar
 
-xalan27.jar: xalan27/dist/xalan27.jar
-       cp xalan27/dist/xalan27.jar .
+xalan27.jar: build2/lib/docbook-xsl-xalan27.jar
+       cp build2/lib/docbook-xsl-xalan27.jar xalan27.jar
 
 build/lib/docbook-xsl-saxon.jar:
        $(ANT) jar.saxon
 
 build/lib/docbook-xsl-xalan.jar:
+       CLASSPATH=/usr/share/java/xalan25.jar:$$CLASSPATH \
        $(ANT) jar.xalan
 
+build2/lib/docbook-xsl-xalan27.jar:
+       $(ANT) jar.xalan27
+
 clean:
        $(ANT) clean
-       rm -rf *.jar
+       $(RM) *.jar

diff --git a/xsl/extensions/build.xml b/xsl/extensions/build.xml
index 405289d5a5534d958398a8e6b621b68a137409b3..12bf450e0a3c82d3ade867244170d7ac8733ff93 100644 (file)
--- a/xsl/extensions/build.xml
+++ b/xsl/extensions/build.xml
@@ -9,24 +9,32 @@
   <property name="name" value="docbook-xsl"/>
   <property name="src.saxon" value="saxon643"/>
   <property name="src.xalan" value="xalan2"/>
+  <property name="src.xalan27" value="xalan27/src"/>
   <property name="build" value="build"/>
+  <property name="build2" value="build2"/>
   <property name="build.classes" value="${build}/classes"/>
+  <property name="build2.classes" value="${build2}/classes"/>
   <property name="build.doc.xalan" value="${build}/api/xalan"/>
   <property name="build.doc.saxon" value="${build}/api/saxon"/>
   <property name="build.lib" value="${build}/lib"/>
+  <property name="build2.lib" value="${build2}/lib"/>
 
   <!-- Targets -->
 
   <target name="prepare" description="Prepare build directories">
     <mkdir dir="${build}"/>
+    <mkdir dir="${build2}"/>
     <mkdir dir="${build.classes}"/>
+    <mkdir dir="${build2.classes}"/>
     <mkdir dir="${build.lib}"/>
+    <mkdir dir="${build2.lib}"/>
     <mkdir dir="${build.doc.xalan}"/>
     <mkdir dir="${build.doc.saxon}"/>
   </target>
 
   <target name="clean" description="Remove build directories">
     <delete dir="${build}"/>
+    <delete dir="${build2}"/>
   </target>
 
   <target name="classes.xalan" depends="prepare"
@@ -34,6 +42,11 @@
     <javac srcdir="${src.xalan}" destdir="${build.classes}"/>
   </target>
 
+  <target name="classes.xalan27" depends="prepare"
+          description="Build Xalan 2.7 extension classes">
+    <javac srcdir="${src.xalan27}" destdir="${build2.classes}"/>
+  </target>
+
   <target name="classes.saxon" depends="prepare"
           description="Build Saxon extension classes">
     <javac srcdir="${src.saxon}" destdir="${build.classes}"/>
@@ -47,6 +60,15 @@
     </jar>
   </target>
 
+  <target name="jar.xalan27" depends="classes.xalan27"
+          description="Build the Xalan 2.7 extension jar">
+    <jar destfile="${build2.lib}/${name}-xalan27.jar"
+         basedir="${build2.classes}"
+         includes="com/nwalsh/xalan/*">
+    </jar>
+  </target>
+
+
   <target name="jar.saxon" depends="classes.saxon"
           description="Build the Saxon extension jar">
     <jar destfile="${build.lib}/${name}-saxon.jar"
@@ -55,7 +77,7 @@
     </jar>
   </target>
 
-  <target name="jars" depends="jar.saxon,jar.xalan"
+  <target name="jars" depends="jar.saxon,jar.xalan,jar.xalan27"
           description="Build all jars" />
 
   <target name="javadoc.xalan" depends="prepare"