grchiu 2003/08/28 15:42:32 Modified: java build.xml Log: Patch from Sarah McNamara ([EMAIL PROTECTED]). Removing JavaCupRedirect from the jar files. This class is only needed at build time, and causes build problems when placed on the bootclasspath (when bootclasspathing xalan.jar under JDK 1.4). See also (http://marc.theaimsgroup.com/?l=xalan-cvs&m=105637851030164&w=2) Revision Changes Path 1.196 +13 -4 xml-xalan/java/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/xml-xalan/java/build.xml,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- build.xml 23 Jun 2003 14:26:57 -0000 1.195 +++ build.xml 28 Aug 2003 22:42:31 -0000 1.196 @@ -410,6 +410,7 @@ <patternset><!-- relative to jar/@basedir --> <include name="org/apache/xml/**" /> <include name="${xsltc.reldir}/**/*" /> + <exclude name="org/apache/xalan/xsltc/util/JavaCupRedirect*" /> </patternset> </jar> </target> @@ -493,7 +494,10 @@ <!-- make bundled jar named xsltc.jar --> <jar jarfile="${build.dir}/xsltc.jar" manifest="${build.dir}/manifest.xsltc" > - <fileset dir="${build.classes}" includes="org/apache/xalan/xsltc/**" /> + <fileset dir="${build.classes}"> + <include name="org/apache/xalan/xsltc/**"/> + <exclude name="org/apache/xalan/xsltc/util/JavaCupRedirect*" /> + </fileset> <fileset dir="${build.classes}" includes="org/apache/xml/**" /> <fileset dir="${build.classes}" includes="org/apache/bcel/**" /> <fileset dir="${build.classes}" includes="JLex/**" /> @@ -537,6 +541,7 @@ <include name="${xpath.reldir}/**/*" /> <include name="${xalan.reldir}/**/*" /> <include name="META-INF/services/*" /> + <exclude name="${xsltc.reldir}/util/JavaCupRedirect*" /> </patternset> </jar> </target> @@ -553,7 +558,11 @@ <!-- make bundled jar named xalan.jar --> <jar jarfile="${build.xalan.jar}" manifest="${build.dir}/MANIFEST.MF" - basedir="${build.classes}" /> + basedir="${build.classes}" > + <patternset> + <exclude name="${xsltc.reldir}/util/JavaCupRedirect*" /> + </patternset> + </jar> </target>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
