This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxalan2-java.
commit 0eebe8fdde94b783d6ee6bc7a103f0dfec80f43f Author: Stefan Gybas <sgy...@debian.org> Date: Mon May 19 17:37:52 2003 +0000 Debian release 2.5.0-1 --- build.xml | 617 +++++++++++++++++++++++++++++++++---------------------- debian/changelog | 8 + debian/control | 4 +- debian/rules | 7 +- 4 files changed, 386 insertions(+), 250 deletions(-) diff --git a/build.xml b/build.xml index d2d6c64..70d3dbb 100644 --- a/build.xml +++ b/build.xml @@ -40,7 +40,7 @@ Authors: Don Leslie <donald_les...@lotus.com> Copyright: - Copyright (c) 1999-2001 The Apache Software Foundation. + Copyright (c) 1999-2003 The Apache Software Foundation. $Id$ ==================================================================== --> @@ -50,6 +50,7 @@ Copyright: <!-- =================================================================== --> <!-- We keep checked-in known-good .jars here --> <property name="bin.dir" value="./bin"/> + <property name="java.dir" value="/usr/share/java"/> <!-- GUMP: Allows external build systems to replace .jars Xalan is dependent on as needed. Most have separate name and @@ -59,9 +60,9 @@ Copyright: <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"/> - <property name="parser.jar" value="/usr/share/java/${parser.jar.name}"/> + <property name="parser.jar" value="${java.dir}/${parser.jar.name}"/> <property name="bsf.jar.name" value="bsf.jar"/> - <property name="bsf.jar" value="/usr/share/java/${bsf.jar.name}"/> + <property name="bsf.jar" value="${java.dir}/${bsf.jar.name}"/> <property name="stylebook.jar.name" value="stylebook-1.0-b3_xalan-2.jar"/> <property name="stylebook.jar" value="${bin.dir}/${stylebook.jar.name}"/> <property name="doclet.jar.name" value="xalan2jdoc.jar"/> @@ -69,37 +70,38 @@ Copyright: <!-- GUMP: Currently 18-Apr-01 used only for xsltc.compile --> <property name="bcel.jar.name" value="bcel.jar"/> - <property name="bcel.jar" value="/usr/share/java/${bcel.jar.name}"/> - <property name="crimson.jar.name" value="crimson.jar"/><!-- Why is this here? 10-Sep-01 -sc --> - <property name="crimson.jar" value="${bin.dir}/${crimson.jar.name}"/> + <property name="bcel.jar" value="${java.dir}/${bcel.jar.name}"/> <property name="java_cup.jar.name" value="cup.jar"/> - <property name="java_cup.jar" value="/usr/share/java/${java_cup.jar.name}"/> + <property name="java_cup.jar" value="${java.dir}/${java_cup.jar.name}"/> <property name="jlex.jar.name" value="JLex.jar"/> - <property name="jlex.jar" value="/usr/share/java/${jlex.jar.name}"/> - <property name="runtime.jar.name" value="runtime.jar"/> + <property name="jlex.jar" value="${java.dir}/${jlex.jar.name}"/> <!-- The Debian cup package has the runtime classes in cup.jar --> - <property name="runtime.jar" value="/usr/share/java/${runtime.jar.name}"/> + <property name="runtime.jar.name" value="cup.jar"/> + <property name="runtime.jar" value="${java.dir}/${runtime.jar.name}"/> <property name="regexp.jar.name" value="regexp.jar"/> - <property name="regexp.jar" value="/usr/share/java/${regexp.jar.name}"/> - + <property name="regexp.jar" value="${java.dir}/${regexp.jar.name}"/> + <property name="xsltc.deps.license" value="BCEL.LICENSE.txt,BCEL.README.txt,JLex.LICENSE.txt,JLex.README.txt,java_cup.LICENSE.txt,java_cup.README.txt,runtime.LICENSE.txt,runtime.README.txt,regexp.LICENSE.txt,regexp.README.txt"/> + <!-- Defines general variables used by the other targets; name controls output xalan.jar --> <property name="version.VERSION" value="2"/> - <property name="version.RELEASE" value="4"/> + <property name="version.RELEASE" value="5"/> <property name="version.DEVELOPER" value=""/><!-- Set this to 'D' if a developer release; blank "" if maintenance release --> <property name="version.MINOR" value="0"/><!-- EITHER the developer release number, or a maintenance release number --> <property name="version" value="${version.VERSION}_${version.RELEASE}_${version.DEVELOPER}${version.MINOR}"/><!-- GUMP: version # of dist file --> <property name="impl.version" value="${version.VERSION}.${version.RELEASE}.${version.DEVELOPER}${version.MINOR}"/><!-- Used in jar task for filtering MANIFEST.MF file --> <property name="name" value="xalan"/><!-- GUMP: base name of jar target's file --> - <property name="year" value="2002"/> + <property name="year" value="2003"/> <property name="build.debug" value="on"/> <!-- Relative locations of source directories --> <property name="manifest.mf" value="./src/MANIFEST.MF"/> <property name="manifest.xsltc.mf" value="./src/manifest.xsltc"/> + <property name="XSLTInfo.props" value="./src/org/apache/xalan/res/XSLTInfo.properties"/> <property name="src.dir" value="./src"/> <property name="apachexml.reldir" value="org/apache/xml"/> <property name="xpath.reldir" value="org/apache/xpath"/> <property name="xalan.reldir" value="org/apache/xalan"/> + <property name="domxpath.reldir" value="org/w3c/dom/xpath"/> <property name="xsltc.reldir" value="${xalan.reldir}/xsltc"/> <property name="generated.xpathparser" value="${src.dir}/${xsltc.reldir}/compiler/XPathParser.java"/> <property name="generated.xpathlexer" value="${src.dir}/${xsltc.reldir}/compiler/XPathLexer.java"/> @@ -108,25 +110,17 @@ Copyright: <!-- Build and distribution output areas --> <property name="build.dir" value="./build"/><!-- GUMP: root of all normal builds output --> <property name="build.xalan.jar" value="${build.dir}/${name}.jar"/><!-- GUMP: actual path/name of jar target output --> + <property name="build.xalan-unbundled.jar" value="${build.dir}/${name}-unbundled.jar"/> + <property name="build.xalan-interpretive.jar" value="${build.dir}/${name}-interpretive.jar"/> <property name="build.xsltc.jar" value="${build.dir}/xsltc.jar"/> <property name="build.classes" value="${build.dir}/classes"/> <property name="build.docs" value="${build.dir}/docs"/> <property name="build.samples" value="${build.dir}/samples"/> + <property name="build.servlet" value="${build.samples}/servlet"/> <property name="build.apidocs" value="${build.docs}/apidocs"/> <property name="dist.file" value="${name}-j_${version}"/><!-- GUMP: actual path/name of dist target .tar.gz/.zip--> <property name="dist.dir" value="${build.dir}/${dist.file}"/> - <!-- Xalan-J1 compatability stuff. --> - <!-- TO BE REMOVED: 'skipcompat' flag allows you to optionally - skip 1.x compat layer; default to true, so we can - switch to Xerces 2.x which compat won't compile with --> - <property name="skipcompat" value="true"/> - <property name="compat.jar" value="xalanj1compat.jar"/> - <property name="compat.src.dir" value="./compat_src"/> - <property name="build.compat.classes" value="${build.dir}/compat_classes"/> - <property name="build.compat.jar" value="${build.dir}/${compat.jar}"/> - <property name="build.compat.apidocs" value="${build.docs}/compat_apidocs"/> - <!-- xml-commons sources (for Javadoc) --> <property name="xml-commons-srcs.tar.gz" value="${src.dir}/xml-commons-src.tar.gz"/> <property name="xml-commons-srcs.tar" value="${build.dir}/xml-commons-src.tar"/> @@ -136,7 +130,12 @@ Copyright: <property name="version.file" value="${xalan.reldir}/processor/XSLProcessorVersion.java"/> <property name="samples.dir" value="./samples"/> <property name="build.samples.jar" value="${build.dir}/xalansamples.jar"/> - <property name="build.servlet.jar" value="${build.dir}/xalanservlet.jar"/> + <property name="build.servlet.war" value="${build.dir}/xalanservlet.war"/> + <property name="build.xsltc.applet.jar" value="${build.dir}/xsltcapplet.jar"/> + <property name="build.xsltc.brazil.jar" value="${build.dir}/xsltcbrazil.jar"/> + <property name="build.xsltc.ejb.jar" value="${build.dir}/xsltcejb.jar"/> + <property name="build.xsltc.servlet.jar" + value="${build.dir}/xsltcservlet.jar"/> <property name="xdocs.dir" value="./xdocs"/> <property name="xdocs.book" value="${xdocs.dir}/sources/xalan-jlocal.xml"/> <property name="xdocs.style" value="${xdocs.dir}/style"/> @@ -178,9 +177,17 @@ Copyright: </path> <path id="xslt.boot.class.path"> <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ --> + <!-- 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 location="${build.classes}" /> + <pathelement path="${build.boot.class.path}" /> <pathelement path="${sun.boot.class.path}" /> </path> + <path id="compile.source.path"> + <dirset dir="${src.dir}" includes="/org/apache/**" /> + </path> + <!-- =================================================================== --> <!-- Creates output build directories and doc prerequistes --> @@ -226,61 +233,61 @@ Copyright: </target> <!-- =================================================================== --> - <!-- Compile entire source tree --> + <!-- Compile the DTM implementation and xml utilities --> <!-- =================================================================== --> - <target name="compile" depends="prepare" - description="Compile Xalan-J 2.x (skips 1.x compat and XSLTC)" > - <echo message="compile entire source tree and copy .properties and .res files to build tree."/> - <!-- Note: split compile into separate javac steps to avoid JDK 1.1.8 bug reported at: - http://developer.java.sun.com/developer/bugParade/bugs/4043508.html - which causes an error like: - [javac] E:\builds\xml-xalan\java\src\org\apache\xalan\templates\ElemTemplate.java:108: Cyclic class inheritance or scoping. - --> - <!-- Compile XPath engine and some common utilities --> - <javac srcdir="${src.dir}" + <target name="xml.compile" depends="prepare"> + <echo message="Compiling DTM implementation and utilities" /> + <javac srcdir="${src.dir}" destdir="${build.classes}" - debug="${build.debug}" > - <!-- Also compile version info classes here --> - <include name="${xalan.reldir}/Version.java" /> - <include name="${xalan.reldir}/processor/XSLProcessorVersion.java" /> + debug="${build.debug}" + target="1.1" > <include name="${apachexml.reldir}/**/*.java" /> <!-- But exclude unused synthetic* files; should be obsoleted from CVS --> - <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" /> - <include name="${xpath.reldir}/**/*.java" /> - <exclude name="**/CoroutineSAXFilterTest.java" - unless="xerces.present" /> - <exclude name="**/CoroutineSAXParser_Xerces.java" - unless="xerces.present" /> + <exclude name="${apachexml.reldir}/utils/synthetic/**/*.java" /> <exclude name="**/IncrementalSAXSource_Xerces.java" unless="xerces.present" /> <classpath refid="compile.class.path" /> <bootclasspath refid="xslt.boot.class.path" /> </javac> - <!-- Compile Xalan main engine (but not xsltc package yet) --> - <javac srcdir="${src.dir}" - destdir="${build.classes}" - includes="${xalan.reldir}/**/*.java" - excludes="${xsltc.reldir}/**/*.java,${xalan.reldir}/lib/**/*.java,${xalan.reldir}/xslt/**/*.java" - debug="${build.debug}" > - <classpath refid="compile.class.path" /> - <bootclasspath refid="xslt.boot.class.path" /> - </javac> - <!-- Compile various Xalan-specific extensions and command line class --> + <!-- Copy needed properties, resource, etc. files to be put into .jar file --> + <copy todir="${build.classes}"> + <fileset dir="${src.dir}" includes="${apachexml.reldir}/**/*.properties"/> + </copy> + </target> + + <!-- =================================================================== --> + <!-- Compile the Xalan interpreter source tree --> + <!-- =================================================================== --> + <target name="xalan-interpretive.compile" depends="xml.compile" + description="Compile the Xalan interpretive classes (skips XSLTC)" > + <echo message="Compiling Xalan interpretive classes" /> <javac srcdir="${src.dir}" destdir="${build.classes}" - includes="${xalan.reldir}/lib/**/*.java,${xalan.reldir}/xslt/**/*.java" - debug="${build.debug}" > + debug="${build.debug}" + target="1.1" > + <include name="${xpath.reldir}/**/*.java" /> + <include name="${domxpath.reldir}/**/*.java" /> + <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 --> <copy todir="${build.classes}"> - <fileset dir="${src.dir}" includes="**/*.properties,**/*.res,META-INF/services/*"/> + <fileset dir="${src.dir}" includes="**/*.properties,META-INF/services/*" excludes="**/XSLTInfo.properties"/> </copy> + <filter token="impl.version" value="${impl.version}"/> + <copy todir="${build.classes}/org/apache/xalan/res" file="${XSLTInfo.props}" filtering="true"/> + </target> + + <!-- Compile all java sources (Xalan interpretive and XSLTC) --> + <target name="compile" depends="xalan-interpretive.compile,xsltc.compile" + description="Compile all java source files (Xalan interpretive + XSLTC)" > </target> <!-- =================================================================== --> - <!-- Compile just the XSLTC compiler portion (to be integrated soon!) --> + <!-- Compile just the XSLTC compiler portion --> <!-- =================================================================== --> <path id="xsltc.class.path"> <pathelement location="${xmlapis.jar}" /> @@ -288,7 +295,6 @@ Copyright: <pathelement location="${jlex.jar}" /> <pathelement location="${java_cup.jar}" /> <pathelement location="${runtime.jar}" /> - <pathelement location="${crimson.jar}" /> <!-- build.classes needed for org.apache.xalan.xsltc.util.JavaCupRedirect --> <pathelement location="${build.classes}" /> @@ -311,19 +317,24 @@ Copyright: actually need to generate the java_cup and jlex files in the two sub-targets below --> - <!-- NOTE: The two uptodate tasks below do not yet work! 28-Nov-01 -sc --> - <uptodate property="xsltc.java_cup.needed" > - <srcfiles dir= "${src.dir}/${xsltc.reldir}/compiler" includes="xpath.cup"/> - <mapper type="merge" to="${generated.xpathparser}"/> - </uptodate> - <uptodate property="xsltc.jlex.needed" > - <srcfiles dir= "${src.dir}/${xsltc.reldir}/compiler" includes="xpath.lex"/> - <mapper type="merge" to="${generated.xpathlexer}"/> + <uptodate property="xsltc.java_cup.not_needed" targetfile="${generated.xpathparser}" > + <srcfiles dir="${src.dir}/${xsltc.reldir}/compiler" includes="xpath.cup" /> </uptodate> + + <uptodate property="xsltc.jlex.not_needed" targetfile="${generated.xpathlexer}" > + <srcfiles dir="${src.dir}/${xsltc.reldir}/compiler" includes="xpath.lex" /> + </uptodate> + + <!-- Determine whether the support jars are already expanded --> + <available file="${build.classes}/org/apache/bcel" type="dir" property="xsltc.bcel_jar.not_needed" /> + <available file="${build.classes}/JLex" type="dir" property="xsltc.jlex_jar.not_needed" /> + <available file="${build.classes}/java_cup/Main.class" type="file" property="xsltc.java_cup_jar.not_needed" /> + <available file="${build.classes}/java_cup/runtime" type="dir" property="xsltc.runtime_jar.not_needed" /> + <available file="${build.classes}/org/apache/regexp" type="dir" property="xsltc.regexp_jar.not_needed" /> </target> - <!-- Generate code sources for xsltc if needed --> - <target name="xsltc.java_cup" depends="xsltc.prepare" > <!-- if="xsltc.java_cup.needed" --> + <!-- Generate the XPath parser sources for xsltc if needed --> + <target name="xsltc.java_cup" depends="xsltc.prepare" unless="xsltc.java_cup.not_needed"> <!-- The second step generates sym.java and XPathParser.java. --> <echo message="java_cup preparsing"/> <java fork="yes" failonerror="true" @@ -337,25 +348,24 @@ Copyright: <echo message="java_cup move output files"/> <move file="XPathParser.java" tofile="${generated.xpathparser}"/> <move file="sym.java" tofile="${generated.xpathsym}"/> - </target> - <target name="xsltc.jlex" depends="xsltc.java_cup" ><!--if="xsltc.jlex.needed" --> + + <!-- Generate the XPath lexer sources for xsltc if needed --> + <target name="xsltc.jlex" depends="xsltc.java_cup" unless="xsltc.jlex.not_needed"> <!-- The third step generates XPathLexer.java. The lexiographical analyser has to be generated after sym.java, so order is important. --> <echo message="JLex preparsing"/> <java fork="yes" failonerror="true" classname="JLex.Main" > <classpath refid="xsltc.class.path" /> + <!-- "-static" is not understood by the Debian JLex package --> <arg line="${src.dir}/${xsltc.reldir}/compiler/xpath.lex"/> </java> <echo message="JLex move output file"/> <move file="${src.dir}/${xsltc.reldir}/compiler/xpath.lex.java" tofile="${generated.xpathlexer}"/> </target> - <!-- The xsltc.compile target should be rewritten to properly - do dependencies on the generated sources: right now, it - will always regenerate the sources, even if it's not needed - (which forces all later steps to re-run as well) --> - <target name="xsltc.compile" depends="xsltc.java_cup,xsltc.jlex" + <!-- Compile the main XSLTC classes --> + <target name="xsltc.compile" depends="xsltc.java_cup,xsltc.jlex,xml.compile" description="Compile just the XSLTC classes" > <echo message="Compiling remaining XSLTC classes"/> <javac srcdir="${src.dir}" @@ -367,7 +377,8 @@ Copyright: </javac> </target> - <target name="xsltc.fcompile" + <!-- Compile just the XSLTC classes w/o JLex, JCup recompilation --> + <target name="xsltc.fcompile" depends="xml.compile" description="Compile just the XSLTC classes w/o JLex, JCup recompilation" > <echo message="Compiling remaining XSLTC classes"/> <javac srcdir="${src.dir}" @@ -379,6 +390,7 @@ Copyright: </javac> </target> + <!-- Jar up the XSLTC classes w/o the support jars --> <target name="xsltc.unbundledjar" depends="xsltc.compile" description="Jar just the xsltc.jar file" > <!-- Copy over the manifest, with filtering (for version number) --> @@ -386,85 +398,68 @@ Copyright: <copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/> <jar jarfile="${build.xsltc.jar}" manifest="${build.dir}/manifest.xsltc" basedir="${build.classes}" > <patternset><!-- relative to jar/@basedir --> + <include name="org/apache/xml/**" /> <include name="${xsltc.reldir}/**/*" /> </patternset> </jar> </target> + <!-- Copy license and readme files for XSLTC support jars --> + <target name="xsltc.copy-licenses" depends="xsltc.prepare"> + <echo message="Copying license files for XSLTC support jars"/> + <copy todir="${build.classes}"> + <fileset dir="${bin.dir}" casesensitive="no" includes="${xsltc.deps.license}"/> + </copy> + </target> + + <!-- A parametrized target which is used to copy and expand a XSLTC support jar --> + <target name="xsltc.copy-deps-jar" unless="${param_unless}"> + <!-- copy the jar file to the build/classes directory --> + <copy todir="${build.classes}" file="${java.dir}/${param_jar_name}"/> + + <!-- unjar the jar file --> + <unjar src="${build.classes}/${param_jar_name}" dest="${build.classes}" /> + + <!-- remove the jar file --> + <delete file="${build.classes}/${param_jar_name}" /> + </target> + + <!-- Copy and expand the XSLTC support jars if needed --> + <target name="xsltc.copy-deps-jars" depends="xsltc.copy-licenses"> + <echo message="Copying XSLTC support jars" /> + <!-- copy the 3rd party support jar files --> + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.bcel_jar.not_needed" /> + <param name="param_jar_name" value="${bcel.jar.name}" /> + </antcall> - <target name="xsltc.jar" depends="xsltc.compile" - description="Jar xsltc, BCEL,JLex,java_cup,runtime and jakarta regexp"> - <!-- make a tmp directory to work in --> - <delete dir="${build.dir}/xsltctmp" includeEmptyDirs="true" quiet="true"/> - <mkdir dir="${build.dir}/xsltctmp" /> + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.jlex_jar.not_needed" /> + <param name="param_jar_name" value="${jlex.jar.name}" /> + </antcall> - <!-- create jar of xsltc classes in the tmp directory --> - <jar jarfile="${build.dir}/xsltctmp/xsltc.jar" - basedir="${build.dir}/classes" - includes="org/apache/xalan/xsltc/**" /> + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.java_cup_jar.not_needed" /> + <param name="param_jar_name" value="${java_cup.jar.name}" /> + </antcall> - <!-- copy the xsltc 3rd party support jar files and licenses - to tmp dist dir - --> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/BCEL.jar"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/BCEL.LICENSE.txt"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/BCEL.README.txt"/> - - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/JLex.jar"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/JLex.LICENSE.txt"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/JLex.README.txt"/> - - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/java_cup.jar"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/java_cup.LICENSE.txt"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/java_cup.README.txt"/> - - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/runtime.jar"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/runtime.LICENSE.txt"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/runtime.README.txt"/> - - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/regexp.jar"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/regexp.LICENSE.txt"/> - <copy todir="${build.dir}/xsltctmp" - file="${bin.dir}/regexp.README.txt"/> - - <!-- unjar all jars --> - <unjar src="${build.dir}/xsltctmp/xsltc.jar" - dest="${build.dir}/xsltctmp" /> - <unjar src="${build.dir}/xsltctmp/BCEL.jar" - dest="${build.dir}/xsltctmp" /> - <unjar src="${build.dir}/xsltctmp/JLex.jar" - dest="${build.dir}/xsltctmp" /> - <unjar src="${build.dir}/xsltctmp/java_cup.jar" - dest="${build.dir}/xsltctmp" /> - <unjar src="${build.dir}/xsltctmp/runtime.jar" - dest="${build.dir}/xsltctmp" /> - <unjar src="${build.dir}/xsltctmp/regexp.jar" - dest="${build.dir}/xsltctmp" /> - - <!-- remove jar files --> - <delete file="${build.dir}/xsltctmp/xsltc.jar" /> - <delete file="${build.dir}/xsltctmp/BCEL.jar" /> - <delete file="${build.dir}/xsltctmp/JLex.jar" /> - <delete file="${build.dir}/xsltctmp/java_cup.jar" /> - <delete file="${build.dir}/xsltctmp/runtime.jar" /> - - <!-- remove old META-INF dir --> - <delete dir="${build.dir}/xsltctmp/META-INF" - includeEmptyDirs="true" quiet="true"/> + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.runtime_jar.not_needed" /> + <param name="param_jar_name" value="${runtime.jar.name}" /> + </antcall> + + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.regexp_jar.not_needed" /> + <param name="param_jar_name" value="${regexp.jar.name}" /> + </antcall> + + <!-- remove the old META-INF/MANIFEST.MF file --> + <delete file="${build.classes}/META-INF/MANIFEST.MF" quiet="true"/> + </target> + + <!-- Jar up all XSLTC classes including the support jars --> + <target name="xsltc.jar" depends="xsltc.compile,xsltc.copy-deps-jars" + description="Jar xsltc,xml,BCEL,JLex,java_cup,runtime and jakarta regexp"> <!-- create new META-INF dir w/ transformer factory default --> <!-- GTM: comment this out so that bundled xsltc.jar does not have @@ -481,84 +476,81 @@ Copyright: <copy todir="${build.dir}" file="${manifest.xsltc.mf}" filtering="true"/> <!-- make bundled jar named xsltc.jar --> - <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc" - basedir="${build.dir}/xsltctmp" /> + <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc" > + <fileset dir="${build.classes}" includes="org/apache/xalan/xsltc/**" /> + <fileset dir="${build.classes}" includes="org/apache/xml/**" /> + <fileset dir="${build.classes}" includes="org/apache/bcel/**" /> + <fileset dir="${build.classes}" includes="JLex/**" /> + <fileset dir="${build.classes}" includes="java_cup/**" /> + <fileset dir="${build.classes}" includes="org/apache/regexp/**" /> + <fileset dir="${build.classes}" includes="${xsltc.deps.license}" /> + </jar> - <!-- clean up tmp directory --> - <delete dir="${build.dir}/xsltctmp" includeEmptyDirs="true" quiet="true"/> </target> <!-- =================================================================== --> - <!-- Creates the xalan JAR --> + <!-- Creates the xalan interpretive jar --> <!-- =================================================================== --> - <target name="jar" depends="compile" - description="Jar up xalan.jar, plus the ${xmlapis.jar.name}" > + <target name="xalan-interpretive.jar" depends="xalan-interpretive.compile" + description="Jar up everything in Xalan interpretive (without XSLTC)" > <!-- Copy over the manifest, with filtering (for version number) --> <filter token="impl.version" value="${impl.version}"/> <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/> - <jar jarfile="${build.xalan.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" > + <jar jarfile="${build.xalan-interpretive.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" > <patternset><!-- relative to jar/@basedir --> + <include name="${apachexml.reldir}/**/*" /> + <include name="${xpath.reldir}/**/*" /> + <include name="${xalan.reldir}/**/*" /> + <include name="META-INF/services/*" /> <exclude name="${xsltc.reldir}/**/*" /> </patternset> </jar> </target> <!-- =================================================================== --> - <!-- Default all target simply Creates the xalan JAR --> + <!-- Creates the xalan unbundled jar (Xalan interpretive + XSLTC) --> <!-- =================================================================== --> - <target name="all" depends="jar"><!-- 'Standardizing build.xml files' <blorit...@apache.org> --> - <echo message="Redirect to jar target; please provide input on desired functionality of this target"/> + <target name="unbundledjar" depends="xalan-interpretive.compile,xsltc.compile" + description="Jar up Xalan and XSLTC, without the XSLTC dependencies" > + <filter token="impl.version" value="${impl.version}"/> + <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/> + <jar jarfile="${build.xalan-unbundled.jar}" manifest="${build.dir}/MANIFEST.MF" basedir="${build.classes}" > + <patternset> + <include name="${apachexml.reldir}/**/*" /> + <include name="${xpath.reldir}/**/*" /> + <include name="${xalan.reldir}/**/*" /> + <include name="META-INF/services/*" /> + </patternset> + </jar> </target> <!-- =================================================================== --> - <!-- Creates the Xalan-J1 compatability JAR: being removed --> + <!-- Creates one big xalan jar (Xalan interpretive + XSLTC + support jars) --> <!-- =================================================================== --> - <target name="compat.jar" depends="jar" - description="UNSUPPORTED:Compile and jar Xalan-J 1.x backwards compat classes" - unless="skipcompat" > - <echo message="UNSUPPORTED:Compile and jar just the Xalan-J 1 compability API"/> - <mkdir dir="${build.compat.classes}"/> - <javac srcdir="${compat.src.dir}" - destdir="${build.compat.classes}" - includes="**/*.java" - debug="${build.debug}" - bootclasspathref="xslt.boot.class.path" > - <classpath refid="docs.class.path" /> - </javac> - <copy todir="${build.compat.classes}"> - <fileset dir="${compat.src.dir}" includes="**/*.properties,**/*.res"/> - </copy> - <jar jarfile="${build.compat.jar}" manifest="${manifest.mf}" basedir="${build.compat.classes}"/> + <target name="jar" depends="xalan-interpretive.compile,xsltc.compile,xsltc.copy-deps-jars" + description="Jar up everything (Xalan, XSLTC and XSLTC dependencies)" > + + <!-- Copy over the manifest, with filtering (for version number) --> + <filter token="impl.version" value="${impl.version}"/> + <copy todir="${build.dir}" file="${manifest.mf}" filtering="true"/> + + <!-- make bundled jar named xalan.jar --> + <jar jarfile="${build.xalan.jar}" manifest="${build.dir}/MANIFEST.MF" + basedir="${build.classes}" /> + </target> <!-- =================================================================== --> - <!-- Creates the Xalan-J1 compatability javadoc: being removed --> + <!-- Default all target simply Creates the xalan JAR --> <!-- =================================================================== --> - <target name="compat.javadocs" depends="jar" - description="UNSUPPORTED:Build javadocs for Xalan-J 1.x backwards compat classes" - unless="skipcompat" > - <mkdir dir="${build.compat.apidocs}"/> - <javadoc - public="true" - sourcepath="${compat.src.dir}" - overview="${compat.src.dir}/compatOverview.html" - packagenames="org.apache.xalan.xslt,org.apache.xalan.xpath,org.apache.xalan.xpath.xml" - author="true" - version="true" - use="true" - destdir="${build.compat.apidocs}" - windowtitle="${Name-in-docs} 1 Compatability" - doctitle="${Name-in-docs} 1 Compatability" - bottom="Copyright © ${year} Apache XML Project. All Rights Reserved."> - <classpath refid="docs.class.path" /> - </javadoc> + <target name="all" depends="jar"><!-- 'Standardizing build.xml files' <blorit...@apache.org> --> + <echo message="Redirect to jar target; please provide input on desired functionality of this target"/> </target> - - + <!-- =================================================================== --> <!-- Compiles the samples (servlet excluded) and jars the class files --> <!-- =================================================================== --> - <target name="samples" depends="jar" + <target name="samples" depends="jar,xsltc.samples" description="Compile and jar the samples (except servlet)" > <property name="exclude" value="*.xml,*.xsl,*.txt,*.html,*.properties,*.out"/> <mkdir dir="${build.samples}"/> @@ -607,7 +599,12 @@ Copyright: destdir="${build.samples}" excludes="${exclude}" debug="${build.debug}" bootclasspathref="xslt.boot.class.path" > <classpath refid="samples.class.path" /> - </javac> + </javac> + <javac srcdir="${samples.dir}/ApplyXPathDOM" + destdir="${build.samples}" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" > + <classpath refid="samples.class.path" /> + </javac> <javac srcdir="${samples.dir}/trax" destdir="${build.samples}" excludes="${exclude}" debug="${build.debug}" bootclasspathref="xslt.boot.class.path" > @@ -624,49 +621,134 @@ Copyright: <classpath refid="samples.class.path" /> </javac> <jar jarfile="${build.samples.jar}" basedir="${build.samples}" - includes="*.class"/> + includes="*.class"/> </target> - + + <!-- =================================================================== --> + <!-- Compiles all samples that require extra standard components in --> + <!-- order to compile. --> + <!-- =================================================================== --> + <target name="extra.std.samples" + depends="servlet,xsltc.applet,xsltc.ejb,xsltc.servlet"/> + + <!-- =================================================================== --> + <!-- Compiles all samples that require extra non-standard components in --> + <!-- order to compile. --> + <!-- =================================================================== --> + <target name="extra.nonstd.samples" depends="xsltc.brazil"/> + <!-- =================================================================== --> - <!-- Compiles the sample servlet and jars the class files. --> - <!-- The javax.servlet and javax.servlet.http packages --> - <!-- must be on the classpath --> + <!-- Compiles the sample servlet and jars the class files. --> + <!-- The javax.servlet and javax.servlet.http packages --> + <!-- must be on the classpath --> <!-- =================================================================== --> <target name="servlet" depends="jar" - description="Compile and jar the servlet samples" > + description="Compile and jar the servlet samples in xalanservlet.war" > <echo message="To compile the sample servlets, javax.servlet and javax.servlet.http must be on the classpath"/> - <mkdir dir="${build.samples}/servlet"/> + <mkdir dir="${build.servlet}"/> + <mkdir dir="${build.servlet}/WEB-INF/classes/servlet"/> + <mkdir dir="${build.servlet}/WEB-INF/lib"/> <javac srcdir="${samples.dir}/servlet" - destdir="${build.samples}" + destdir="${build.servlet}/WEB-INF/classes" debug="${build.debug}" bootclasspathref="xslt.boot.class.path" > <classpath refid="samples.class.path" /> </javac> - <copy todir="${build.samples}/servlet"> - <fileset dir="${samples.dir}/servlet" - includes="media.properties,default.xsl,default2.xsl"/> + <copy todir="${build.servlet}/WEB-INF/classes/servlet"> + <fileset dir="${samples.dir}/servlet" includes="media.properties"/> </copy> - <jar jarfile="${build.servlet.jar}" - basedir="${build.samples}" - includes="servlet/**"/> + <copy todir="${build.servlet}/WEB-INF"> + <fileset dir="${samples.dir}/servlet" includes="web.xml"/> + </copy> + <copy todir="${build.servlet}"> + <fileset dir="${samples.dir}/servlet" + includes="birds.xml, birds.xsl, booklist1.xsl, + booklist2.xsl, catalog.xml, fooparam.xml, fooparam.xsl, jspSample.jsp"/> + </copy> + <copy todir="${build.servlet}/WEB-INF/lib"> + <fileset dir="${bin.dir}" includes="${parser.jar.name}, ${xmlapis.jar.name}"/> + </copy> + <copy file="${build.xalan.jar}" todir="${build.servlet}/WEB-INF/lib" /> + <jar jarfile="${build.servlet.war}" + basedir="${build.servlet}" + includes="**"/> </target> <!-- =================================================================== --> - <!-- Compiles (does not jar) the translet samples in translets. --> + <!-- Compiles (does not jar) the translet samples. --> <!-- For time being, classes are generated in place. --> <!-- To run these samples, add xsltc.jar, runtime.jar, bcel.jar, --> <!-- and java_cup.jar (all in the bin directory) to the classpath --> <!-- --> <!-- When we have straightened out classpath issues, --> - <!-- add samples in CompiledApplet, CompiledBrazil, and CompiledServlet --> + <!-- add samples in CompiledApplet, CompiledBrazil, CompiledEJB and --> + <!-- CompiledServlet. --> <!-- =================================================================== --> - <target name="xsltc.samples" depends="jar,xsltc.jar"> - <javac srcdir="${samples.dir}/translets" classpath="${java.class.path}:${build.xsltc.jar}" - destdir="${samples.dir}/translets" excludes="${exclude}" - debug="${build.debug}" - bootclasspathref="xslt.boot.class.path" /> + <target name="xsltc.samples" depends="jar"> + <mkdir dir="${build.samples}"/> + <javac srcdir="${samples.dir}/translets" + classpath="${java.class.path}:${build.xalan.jar}" + destdir="${build.samples}" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> + <javac srcdir="${samples.dir}/CompiledJAXP" + destdir="${build.samples}" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> </target> - + + <!-- =================================================================== --> + <!-- Compiles the XSLTC applet example and jars the class files. --> + <!-- =================================================================== --> + <target name="xsltc.applet" depends="jar"> + <mkdir dir="${build.samples}/CompiledApplet"/> + <javac srcdir="${samples.dir}/CompiledApplet" + destdir="${build.samples}/CompiledApplet" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> + <jar jarfile="${build.xsltc.applet.jar}" + basedir="${build.samples}/CompiledApplet" + includes="*.class"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the XSLTC brazil example and jars the class files. --> + <!-- =================================================================== --> + <target name="xsltc.brazil" depends="jar"> + <mkdir dir="${build.samples}/CompiledBrazil"/> + <javac srcdir="${samples.dir}/CompiledBrazil" + destdir="${build.samples}/CompiledBrazil" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> + <jar jarfile="${build.xsltc.brazil.jar}" + basedir="${build.samples}/CompiledBrazil" + includes="*.class"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the XSLTC EJB example and jars the class files. --> + <!-- ejb.jar must be on the classpath to compile this sample. --> + <!-- EJB 2.0 can be found at http://java.sun.com/products/ejb/docs.html --> + <!-- =================================================================== --> + <target name="xsltc.ejb" depends="jar"> + <mkdir dir="${build.samples}/CompiledEJB"/> + <javac srcdir="${samples.dir}/CompiledEJB" + destdir="${build.samples}/CompiledEJB" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> + <jar jarfile="${build.xsltc.ejb.jar}" + basedir="${build.samples}/CompiledEJB" + includes="*.class"/> + </target> + + <!-- =================================================================== --> + <!-- Compiles the XSLTC servlet example and jars the class files. --> + <!-- =================================================================== --> + <target name="xsltc.servlet" depends="jar"> + <mkdir dir="${build.samples}/CompiledServlet"/> + <javac srcdir="${samples.dir}/CompiledServlet" + destdir="${build.samples}/CompiledServlet" excludes="${exclude}" + debug="${build.debug}" bootclasspathref="xslt.boot.class.path" /> + <jar jarfile="${build.xsltc.servlet.jar}" + basedir="${build.samples}/CompiledServlet" + includes="*.class"/> + </target> + <!-- =================================================================== --> <!-- Generate HTML docs --> @@ -712,16 +794,16 @@ Copyright: author="true" version="true" use="true" - windowtitle="${Name-in-docs} 2" - doctitle="${Name-in-docs} 2" - bottom="Copyright © ${year} Apache XML Project. All Rights Reserved." - destDir="${build.apidocs}"> + windowtitle="${Name-in-docs} ${impl.version}" + doctitle="${Name-in-docs} ${impl.version}" + destDir="${build.apidocs}" + bottom="Copyright © ${year} Apache XML Project. All Rights Reserved."> <classpath refid="docs.class.path" /> - <!-- Debian notice: Build throws an expection when using this Doclet + <!-- Debian notice: Build throws an expection when using this Doclet <doclet name="xalanjdoc.Standard" path="${doclet.jar}"> <param name="-d" value="${build.apidocs}"/> </doclet> - --> + --> <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/> <group title="Java API for XML Parsing" packages="javax.xml.parsers"/> <group title="Xalan Core" @@ -738,6 +820,16 @@ Copyright: packages="org.apache.xalan.xsltc*"/> </javadoc> + <!-- remove the xml-commons sources --> + <delete dir="${src.dir}/javax" /> + <delete includeEmptyDirs="true" quiet="true"> + <fileset dir="${src.dir}/org/w3c"> + <exclude name="dom/xpath/**"/> + </fileset> + </delete> + <delete dir="${src.dir}/org/xml" /> + <delete dir="${src.dir}/org/apache/xmlcommons" /> + <delete file="${src.dir}/manifest.commons" /> </target> <!-- =================================================================== --> @@ -760,7 +852,11 @@ Copyright: <!-- Also delete files expanded from ${xml-commons-srcs.tar.gz}--> <delete dir="${src.dir}/javax" includeEmptyDirs="true" quiet="true"/> <delete dir="${src.dir}/org/xml" includeEmptyDirs="true" quiet="true"/> - <delete dir="${src.dir}/org/w3c" includeEmptyDirs="true" quiet="true"/> + <delete includeEmptyDirs="true" quiet="true"> + <fileset dir="${src.dir}/org/w3c"> + <exclude name="dom/xpath/**"/> + </fileset> + </delete> </target> <target name="xsltc.clean" @@ -781,12 +877,36 @@ Copyright: </target> <!-- =================================================================== --> - <!-- Creates the distribution --> + <!-- Creates a distribution that depends only on standard pieces --> + <!-- =================================================================== --> + <target name="dist" depends="build.std.dist,autodist" + description="Create a .zip/.tar.gz distribution module containing + all components without dependencies on non-standard + jars that are not part of the build system." > + <echo message="dist is human-useable target for distribution, with only standard dependencies"/> + </target> + + <!-- =================================================================== --> + <!-- Creates a complete distribution --> <!-- =================================================================== --> - <target name="dist" depends="jar,docs,javadocs,samples,servlet,xsltc.jar,xsltc.docs,autodist" - description="Create a .zip/.tar.gz distribution module" > - <echo message="dist is human-useable target for distribution, with all dependencies"/> + <target name="fulldist" depends="build.nonstd.dist,autodist" + description="Create a .zip/.tar.gz distribution module containing + all components."> + <echo message="fulldist is human-useable target for distribution, with all dependencies"/> </target> + + <target name="build.std.dist" depends="build.std.parts"> + <property name="has.nonstd.parts" value="false"/> + </target> + + <target name="build.nonstd.dist" depends="build.std.parts,build.nonstd.parts"> + <property name="has.nonstd.parts" value="true"/> + </target> + + <target name="build.std.parts" + depends="jar,docs,javadocs,samples,extra.std.samples,xsltc.docs"/> + <target name="build.nonstd.parts" depends="extra.nonstd.samples"/> + <target name="autodist"> <echo message="autodist is for automated build processes, without dependencies"/> <mkdir dir="${dist.dir}"/> @@ -819,7 +939,12 @@ Copyright: <fileset dir="${samples.dir}"/> </copy> <copy file="${build.dir}/xalansamples.jar" todir="${dist.dir}/bin"/> - <copy file="${build.dir}/xalanservlet.jar" todir="${dist.dir}/bin"/> + <copy file="${build.dir}/xalanservlet.war" todir="${dist.dir}/bin"/> + <copy file="${build.dir}/xsltcapplet.jar" todir="${dist.dir}/bin"/> + <copy file="${build.dir}/xsltcbrazil.jar" todir="${dist.dir}/bin" + failonerror="${has.nonstd.parts}"/> + <copy file="${build.dir}/xsltcejb.jar" todir="${dist.dir}/bin"/> + <copy file="${build.dir}/xsltcservlet.jar" todir="${dist.dir}/bin"/> <!-- Copy various built product .jars into the bin directory of the distro, note that changes to what .jars we ship @@ -828,7 +953,6 @@ Copyright: *-bin.zip/tar.gz and *-src.zip/tar.gz files. --> <copy file="${build.xalan.jar}" todir="${dist.dir}/bin" /> - <copy file="${build.xsltc.jar}" todir="${dist.dir}/bin"/> <copy todir="${dist.dir}"> <fileset dir="." includes="readme.html,KEYS,License,build.xml,build.sh,build.bat,xsltc_todo.xml,todo.xsl,commits.xml"/> @@ -844,22 +968,27 @@ Copyright: <include name="${dist.file}/KEYS"/> <include name="${dist.file}/bin/${name}.jar"/> <include name="${dist.file}/bin/${xmlapis.jar.name}"/> - <include name="${dist.file}/bin/xsltc.jar"/> - <include name="${dist.file}/bin/xercesImpl.jar"/> <include name="${dist.file}/bin/${bsf.jar.name}"/> + <include name="${dist.file}/bin/${parser.jar.name}"/> <include name="${dist.file}/bin/xalansamples.jar"/> - <include name="${dist.file}/bin/xalanservlet.jar"/> + <include name="${dist.file}/bin/xalanservlet.war"/> + <include name="${dist.file}/bin/xsltcapplet.jar"/> + <include name="${dist.file}/bin/xsltcbrazil.jar"/> + <include name="${dist.file}/bin/xsltcejb.jar"/> + <include name="${dist.file}/bin/xsltcservlet.jar"/> <include name="${dist.file}/samples/"/> <include name="${dist.file}/docs/"/> </patternset> <patternset id="src-distro" > <include name="${dist.file}/*"/> - <include name="${dist.file}/bin/ant*"/> - <include name="${dist.file}/bin/xercesImpl.jar"/> + <include name="${dist.file}/bin/ant.jar"/> + <include name="${dist.file}/bin/${parser.jar.name}"/> <include name="${dist.file}/bin/${xmlapis.jar.name}"/> <include name="${dist.file}/bin/${bsf.jar.name}"/> <include name="${dist.file}/bin/${stylebook.jar.name}"/> <include name="${dist.file}/bin/${doclet.jar.name}"/> + <include name="${dist.file}/bin/*.LICENSE.txt"/> + <include name="${dist.file}/bin/*.README.txt"/> <include name="${dist.file}/samples/"/> <include name="${dist.file}/src/"/> <include name="${dist.file}/xdocs/"/> @@ -878,7 +1007,7 @@ Copyright: <tar tarfile="${build.dir}/${dist.file}-bin.tar" > <tarfileset dir="${build.dir}"> <patternset refid="bin-distro"/> - <patternset refid="xsltc-deps-jars"/> +<!-- <patternset refid="xsltc-deps-jars"/> --> <!-- these jars are only needed in the src pkg --> </tarfileset> </tar> <gzip src="${build.dir}/${dist.file}-bin.tar" zipfile="${build.dir}/${dist.file}-bin.tar.gz"/> @@ -896,7 +1025,7 @@ Copyright: <zip zipfile="${build.dir}/${dist.file}-bin.zip" > <fileset dir="${build.dir}"> <patternset refid="bin-distro"/> - <patternset refid="xsltc-deps-jars"/> +<!-- <patternset refid="xsltc-deps-jars"/> --> <!-- these jars are only needed in the src pkg --> </fileset> </zip> <zip zipfile="${build.dir}/${dist.file}-src.zip" > diff --git a/debian/changelog b/debian/changelog index 9f7f11a..795722a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libxalan2-java (2.5.0-1) unstable; urgency=low + + * New upstream release (closes: #192631) + * Built using Blackdown's JDK 1.4 instead of the converted RPM from Sun + * Standards-Version: 3.5.10 (no changes required) + + -- Stefan Gybas <sgy...@debian.org> Mon, 19 May 2003 17:36:25 +0200 + libxalan2-java (2.4.1-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index c8762bf..bfee67e 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: libxalan2-java Section: contrib/libs Priority: optional Maintainer: Stefan Gybas <sgy...@debian.org> -Build-Depends-Indep: debhelper (>= 4.1.0), j2sdk (>= 1.4.0-1), ant (>= 1.5-1), libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup -Standards-Version: 3.5.8 +Build-Depends-Indep: debhelper (>= 4.1.0), j2sdk1.4, ant (>= 1.5), libxerces2-java, libbsf-java, libregexp-java, libbcel-java (>= 5.0), jlex, cup +Standards-Version: 3.5.10 Package: libxalan2-java Architecture: all diff --git a/debian/rules b/debian/rules index 9d6c5f7..382603d 100644 --- a/debian/rules +++ b/debian/rules @@ -9,10 +9,9 @@ #export SOURCE_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\)) export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-) -# Build using the converted JDK 1.4 RPM package from Sun (using alien >= 8.08) -export JAVA_HOME=/usr/lib/j2sdk1.4 - -ANT=/usr/bin/ant +# Build using Blackdown's JDK 1.4 package +export JAVA_HOME=/usr/lib/j2se/1.4 +export ANT=/usr/bin/ant build: build-stamp build-stamp: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxalan2-java.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits