This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch AOO50X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ddd5ece42ad57086a6c3b8e78a3100bf444122b2 Author: Pedro Giffuni <[email protected]> AuthorDate: Mon Aug 31 00:00:23 2026 -0500 Remove StAX from the build. AOO still carries a standalone StAX 1.2.0 source tree even though StAX has been part of Java SE since Java 6 and is in the java.xml module today. Modern Java exposes them through; module java.xml javax.xml.stream javax.xml.stream.events javax.xml.stream.util StaX was a dependency for Saxon, but once the corresponding jar is removed, the build goes on fine. (cherry picked from commit 066de3d69e80f4aa6d7fef3cfb549599d157eb7c) --- main/configure.ac | 13 -- main/external_deps.lst | 6 - main/rat-excludes | 7 - main/saxon/prj/build.lst | 2 +- main/saxon/saxon-9.0.0.7-bj.patch | 258 +++++++++++++-------------- main/set_soenv.in | 1 - main/stax/download/README_stax-1.2.0.jar.txt | 13 -- main/stax/makefile.mk | 75 -------- main/stax/prj/build.lst | 2 - main/stax/prj/d.lst | 1 - 10 files changed, 130 insertions(+), 248 deletions(-) diff --git a/main/configure.ac b/main/configure.ac index 75b84637ca..ad97ff5ba8 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -4208,19 +4208,6 @@ else fi AC_SUBST(GPERF) -dnl =================================================================== -dnl Check for building stax -dnl =================================================================== -AC_MSG_CHECKING([whether to build the stax]) -if test -f "./stax/download/stax-1.2.0.jar"; then - BUILD_STAX=NO - AC_MSG_RESULT([no, will use the prebuilt stax/download/stax-1.2.0.jar]) -else - BUILD_STAX=YES - AC_MSG_RESULT([yes]) -fi -AC_SUBST(BUILD_STAX) - dnl =================================================================== dnl Check for building ODK dnl =================================================================== diff --git a/main/external_deps.lst b/main/external_deps.lst index a5e8e36e1d..5af8665e1a 100644 --- a/main/external_deps.lst +++ b/main/external_deps.lst @@ -181,12 +181,6 @@ if (SOLAR_JAVA == TRUE) URL1 = https://archive.apache.org/dist/tomcat/tomcat-5/v5.5.36/src/apache-tomcat-5.5.36-src.tar.gz URL2 = $(OOO_EXTRAS)$(MD5)-$(name) -if (SOLAR_JAVA == TRUE) - MD5 = 980143f96b3f6ce45d2e4947da21a5e9 - name = stax-src-1.2.0.zip - URL1 = $(OOO_EXTRAS)$(MD5)-$(name) - URL2 = http://maven.ibiblio.org/maven/stax/jars/stax-src-1.2.0.zip - if (ENABLE_MEDIAWIKI == YES) MD5 = a7983f859eafb2677d7ff386a023bc40 name = xsltml_2.1.2.zip diff --git a/main/rat-excludes b/main/rat-excludes index ef9a870a3b..cc0e6fde53 100644 --- a/main/rat-excludes +++ b/main/rat-excludes @@ -1264,13 +1264,6 @@ test/testuno/data/uno/sc/fvt/Bug100989MergeAcross0AddsExtraEmptyCell.xml test/testuno/data/uno/sc/fvt/Bug128554FractionalSecondsIgnored.xml test/testuno/data/uno/sc/fvt/Bug81233ColumnZReference.xml -############################################################################## -# -# files with Apache License 2.0 (ALv2) -# that are plain copies, so they cannot be modified - -main/stax/download/README_stax-1.2.0.jar.txt - ############################################################################## # # files with MIT license diff --git a/main/saxon/prj/build.lst b/main/saxon/prj/build.lst index 813097c66d..de579a0474 100644 --- a/main/saxon/prj/build.lst +++ b/main/saxon/prj/build.lst @@ -1,2 +1,2 @@ -xx saxon : solenv stax NULL +xx saxon : solenv NULL xx saxon nmake - all xx_saxon NULL diff --git a/main/saxon/saxon-9.0.0.7-bj.patch b/main/saxon/saxon-9.0.0.7-bj.patch index bf2ed0fa48..597a45126d 100644 --- a/main/saxon/saxon-9.0.0.7-bj.patch +++ b/main/saxon/saxon-9.0.0.7-bj.patch @@ -57,55 +57,55 @@ + + <!-- root drive for input files--> + <property name="root" value="."/> -+ ++ + <!-- root drive for generated files--> + <property name="troot" value="."/> + + <!-- directory holding Java source code --> + <property name="development-j.dir" value="${root}/MyJava/saxon8.x"/> -+ ++ + <!-- directory holding Java source code as in Subversion --> + <property name="subversion-j.dir" value="${root}"/> -+ ++ + <!-- directory holding latest patch state of Saxon-SA Java code --> -+ <property name="saj-patch.dir" value="${root}/saxon-90-patch"/> -+ ++ <property name="saj-patch.dir" value="${root}/saxon-90-patch"/> ++ + <!-- directory holding Java test drivers --> -+ <property name="drivers-j.dir" value="${root}/MyJava/test"/> -+ ++ <property name="drivers-j.dir" value="${root}/MyJava/test"/> ++ + <!-- directories holding C# source code --> + <property name="vss-n.dir" value="${root}/Documents and Settings/Mike/My Documents/Visual Studio 2005/Projects/Saxon.Api"/> + + <!-- directory holding C# source code as in Subversion --> + <property name="subversion-n.dir" value="${root}/saxon-svn/latest9.0/bn/csource"/> -+ ++ + <!-- directory holding XML user documentation --> + <property name="userdoc.dir" value="${root}/MyJava/doc/saxon8"/> -+ ++ + <!-- directory holding .NET API documentation (which is built manually using NDOC --> + <property name="dotnetdoc.dir" value="${root}/MyDotNet/dotnetdoc"/> -+ ++ + <!-- directories holding use cases and sample applications --> + <property name="usercases.dir" value="${root}/MyJava/use-cases"/> + <property name="samples.dir" value="${root}/MyJava/samples"/> -+ ++ + <!-- directory in which to build the product for release --> + <property name="product.dir" value="${troot}/saxon-build/${version}"/> -+ ++ + <!-- directory in which to build the issued .ZIP files --> + <property name="issue.dir" value="${troot}/saxon-issues/saxon-issue-${release.date} (${version})"/> -+ ++ + <!-- location of the C# compiler --> -+ <property name="csharp.compiler" value="c:/Windows/Microsoft.NET/Framework/v1.1.4322/csc.exe"/> -+ -+ ++ <property name="csharp.compiler" value="c:/Windows/Microsoft.NET/Framework/v1.1.4322/csc.exe"/> ++ ++ + <!-- following locations are for IKVMC code used to build the .NET product --> -+ ++ + <property name="development-ikvm.dir" value="${root}/MyDotNet"/> + <property name="ikvm.dir" value="${development-ikvm.dir}/ikvm-0.32.0.0"/> + <property name="generated.stubs.dir" value="${development-ikvm.dir}/stubs"/> + <property name="saxondotnet.snk" value="${development-ikvm.dir}/make/saxondotnet.snk"/> -+ ++ + <!-- Precondition for .NET compilation: IKVM is installed. + * Download from www.ikvm.net + * Unzip into ${development-ikvm.dir} @@ -114,10 +114,10 @@ + At a minimum, install the IKVM.GNU.Classpath.dll and IKVM.Runtime.dll) + * Generate stubs in ${generated.stubs.dir} + for System.Xml.dll, System.Security.dll, and IKVM.GNU.Classpath.dll -+ --> ++ --> + + <!-- following locations are relative to the build file --> -+ ++ + <property name="lib.dir" value="libs"/> + <property name="temp.dir" value="temp"/> + <property name="archive.dir" value="archive"/> @@ -125,20 +125,20 @@ + <property name="temp-src-j.dir" value="${temp.dir}/j/source"/> + <property name="temp-src-nj.dir" value="${temp.dir}/n/jsource"/> + <property name="temp-src-nc.dir" value="${temp.dir}/n/csource"/> -+ <property name="classes-j.dir" value="${temp.dir}/j/classes"/> -+ <property name="classes-n.dir" value="${temp.dir}/n/classes"/> -+ <property name="jar-n.dir" value="${temp.dir}/n/jar"/> -+ <property name="dll-n.dir" value="${temp.dir}/n/dll"/> ++ <property name="classes-j.dir" value="${temp.dir}/j/classes"/> ++ <property name="classes-n.dir" value="${temp.dir}/n/classes"/> ++ <property name="jar-n.dir" value="${temp.dir}/n/jar"/> ++ <property name="dll-n.dir" value="${temp.dir}/n/dll"/> + + <!-- following locations are relative to the destination directory --> + -+ <property name="build-bj.dir" value="${product.dir}/bj"/> -+ <property name="build-saj.dir" value="${product.dir}/saj"/> -+ <property name="build-bn.dir" value="${product.dir}/bn"/> ++ <property name="build-bj.dir" value="${product.dir}/bj"/> ++ <property name="build-saj.dir" value="${product.dir}/saj"/> ++ <property name="build-bn.dir" value="${product.dir}/bn"/> + <property name="build-san.dir" value="${product.dir}/san"/> -+ <property name="build-resources.dir" value="${product.dir}/resources"/> -+ <property name="javadoc.dir" value="${build-resources.dir}/doc/javadoc"/> -+ ++ <property name="build-resources.dir" value="${product.dir}/resources"/> ++ <property name="javadoc.dir" value="${build-resources.dir}/doc/javadoc"/> ++ + + <property name="build.debug" value="true"/> + <property name="build.debuglevel" value="source,lines,vars"/> @@ -149,12 +149,12 @@ + <property name="build.s9api.compiler.source" value="1.8"/> + <property name="build.s9api.compiler.target" value="1.8"/> + <property name="build.compress" value="false"/> -+ ++ + <!-- following properties can be switched to determine whether to build from patch source + or from development source --> -+ ++ + <!-- patch source --> -+ ++ + <property name="source-bj.dir" value="${subversion-j.dir}"/> + <property name="source-saj.dir" value="${saj-patch.dir}"/> + <property name="source-api-n.dir" value="${subversion-n.dir}/api/Saxon.Api"/> @@ -162,21 +162,21 @@ + <property name="source-samples-n.dir" value="${subversion-n.dir}/samples"/> + + <!-- development source --> -+ <!-- ++ <!-- + <property name="source-bj.dir" value="${development-j.dir}"/> + <property name="source-saj.dir" value="${development-j.dir}"/> + <property name="source-api-n.dir" value="${vss-n.dir}"/> + <property name="source-cmd-n.dir" value="${vss-n.dir}"/> -+ <property name="source-samples-n.dir" value="${vss-n.dir}"/> -+ --> -+ ++ <property name="source-samples-n.dir" value="${vss-n.dir}"/> ++ --> ++ + <property name="solar.bin" value="${solarbindir}"/> + <path id="classpath-j"> + <fileset dir="${solar.bin}"> -+ <include name="stax-1.2.0.jar"/> ++ + </fileset> + </path> -+ ++ + <path id="classpath-n"> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> @@ -187,12 +187,12 @@ + <include name="bin/IKVM.GNU.Classpath.jar"/> + <include name="bin/IKVM.Runtime.jar"/> + </fileset> -+ <fileset dir="${generated.stubs.dir}"> ++ <fileset dir="${generated.stubs.dir}"> + <include name="System.Xml.jar"/> + <include name="System.Security.jar"/> -+ </fileset> ++ </fileset> + </path> -+ ++ + <path id="classpath-samples"> + <fileset dir="${lib.dir}"> + <include name="*.jar"/> @@ -202,14 +202,14 @@ + </fileset> + <!-- Substitute build-bj.dir if there is no requirement to compile the sample applications + that depend on Saxon-SA --> -+ </path> -+ ++ </path> ++ + <target name="clean" description="Clean all files other than source code and downloaded jars."> + <delete dir="${temp.dir}"/> + <delete dir="${product.dir}"/> + <mkdir dir="${product.dir}"/> + </target> -+ ++ + <target name="download" description="Download third-party jar files."> + <get src="http://mirrors.ibiblio.org/pub/mirrors/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"; + dest="${lib.dir}/dom4j-1.6.1.jar" verbose="true"/> @@ -219,15 +219,15 @@ + + <get src="http://www.cafeconleche.org/XOM/xom-1.1.jar"; dest="${lib.dir}/xom-1.1.jar" + verbose="true"/> -+ -+ <get src="http://dist.codehaus.org/stax/jars/stax-api-1.0.1.jar"; dest="${lib.dir}/stax-api-1.0.1.jar" -+ verbose="true"/> -+ -+ <!-- TODO: add servlet.jar, ant.jar --> -+ -+ </target> -+ -+ ++ ++ <get src="http://dist.codehaus.org/stax/jars/stax-api-1.2.0.jar"; dest="${lib.dir}/stax-api-1.2.0.jar" ++ verbose="true"/> ++ ++ <!-- TODO: add servlet.jar, ant.jar --> ++ ++ </target> ++ ++ + <target name="copysource-development" description="Copy relevant source files from development directory"> + <copy todir="${temp-src-j.dir}"> + <fileset dir="${source-bj.dir}"> @@ -236,24 +236,24 @@ + <!--<exclude name="**/s9api/**"/> s9api needs Java 5 --> + <include name="net/sf/saxon/**/package.html"/> + </fileset> -+ <!-- ++ <!-- + <fileset dir="${source-saj.dir}"> + <include name="com/saxonica/**/*.java"/> + <exclude name="com/saxonica/validate/DotNetVerifier.java"/> + <include name="com/saxonica/**/package.html"/> -+ </fileset> -+ --> ++ </fileset> ++ --> + </copy> + <!-- + <replace file="${temp-src-j.dir}/com/saxonica/validate/SchemaAwareConfiguration.java" + token="/*DOTNETONLY*/" + value="//" + summary="yes"/> -+ --> ++ --> + <replace file="${temp-src-j.dir}/net/sf/saxon/Configuration.java" + token="/*DOTNETONLY*/" + value="//" -+ summary="yes"/> ++ summary="yes"/> + <copy todir="${temp-src-nj.dir}"> + <fileset dir="${source-bj.dir}"> + <include name="net/sf/saxon/**/*.java"/> @@ -279,13 +279,13 @@ + <include name="com/saxonica/sdoc/*.java"/> + <include name="com/saxonica/validate/*.java"/> + <include name="com/saxonica/Validate.java"/> -+ </fileset>--> ++ </fileset>--> + </copy> + <!-- + <replace file="${temp-src-nj.dir}/com/saxonica/validate/SchemaAwareConfiguration.java" + token="/*JAVAONLY*/" + value="//" -+ summary="yes"/> ++ summary="yes"/> + --> + <replace file="${temp-src-nj.dir}/net/sf/saxon/Configuration.java" + token="/*JAVAONLY*/" @@ -330,7 +330,7 @@ + </fileset> + <fileset dir="${source-samples-n.dir}/SampleExtensions"> + <include name="*.cs"/> -+ </fileset> ++ </fileset> + </copy> + --> + <!-- when building from patch source @@ -348,14 +348,14 @@ + <fileset dir="${source-samples-n.dir}"> + <include name="*.cs"/> + </fileset> -+ </copy> ++ </copy> + --> + <!-- --> + -+ </target> ++ </target> + -+ <target name="create-meta-inf" description="Create contents of META-INF/services files"> -+ ++ <target name="create-meta-inf" description="Create contents of META-INF/services files"> ++ + <!-- given the Ant 1.7.0 bug, create the services files here for copying into the JARS --> + <mkdir dir="${services.dir}/saxon9/META-INF/services"/> + <echo file="${services.dir}/saxon9/META-INF/services/javax.xml.transform.TransformerFactory" @@ -371,13 +371,13 @@ +</echo> + <mkdir dir="${services.dir}/saxon9sa/META-INF/services"/> + <echo file="${services.dir}/saxon9sa/META-INF/services/javax.xml.transform.TransformerFactory" -+ message="com.saxonica.SchemaAwareTransformerFactory"/> ++ message="com.saxonica.SchemaAwareTransformerFactory"/> + <mkdir dir="${services.dir}/saxon9sa-jaxp/META-INF/services"/> + <echo file="${services.dir}/saxon9sa-jaxp/META-INF/services/javax.xml.validation.SchemaFactory" +>com.saxonica.jaxp.SchemaFactoryImpl +http\://www.w3.org/2001/XMLSchema: com.saxonica.jaxp.SchemaFactoryImpl -+</echo> -+ ++</echo> ++ + + </target> + @@ -398,7 +398,7 @@ + <exclude name="**/xpath/**"/> + <exclude name="**/xqj/**"/> + <exclude name="**/dotnet/**"/> -+ <exclude name="**/s9api/**"/> ++ <exclude name="**/s9api/**"/> + + <exclude name="**/ant/**"/> + <exclude name="**/dotnet/**"/> @@ -408,7 +408,7 @@ + </classpath> + </javac> + </target> -+ ++ + <target name="compile-saj" description="Compile Saxon-SA classes for Java." depends="copysource-development"> + <mkdir dir="${classes-j.dir}"/> + <javac debug="${build.debug}" debuglevel="${build.debuglevel}" @@ -424,7 +424,7 @@ + </classpath> + </javac> + </target> -+ ++ + <target name="compile-s9api" description="Compile s9api classes for Java." + depends="compile-bj, compile-saj, copysource-development"> + <!-- Compiling the s9api package requires JDK 1.5 --> @@ -441,7 +441,7 @@ + </classpath> + </javac> + </target> -+ ++ + <target name="compile-bn" description="Compile Saxon-B classes for .NET" depends="copysource-development"> + <mkdir dir="${classes-n.dir}"/> + <javac debug="${build.debug}" debuglevel="${build.debuglevel}" @@ -456,7 +456,7 @@ + </classpath> + </javac> + </target> -+ ++ + <target name="compile-san" description="Compile Saxon-SA classes for .NET" depends="copysource-development"> + <mkdir dir="${classes-n.dir}"/> + <javac debug="${build.debug}" debuglevel="${build.debuglevel}" @@ -470,7 +470,7 @@ + <path refid="classpath-n"/> + </classpath> + </javac> -+ </target> ++ </target> + + <target name="jar-bj" description="Create Saxon-B jar files for Java" depends="create-meta-inf, compile-bj"> + <mkdir dir="${product.dir}/bj"/> @@ -495,7 +495,7 @@ + <!-- + <service type="javax.xml.transform.TransformerFactory" + provider="net.sf.saxon.TransformerFactoryImpl"/> -+ --> ++ --> + </jar> + <!-- + <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/bj/saxon9-dom.jar"> @@ -534,16 +534,16 @@ + <include name="net/sf/saxon/javax/xml/namespace/*.class"/> + <include name="net/sf/saxon/javax/xml/xquery/*.class"/> + </jar> -+ --> ++ --> + </target> -+ ++ + <target name="jar-saj" description="Create Saxon-SA jar files for Java" depends="compile-s9api, jar-bj"> + <mkdir dir="${product.dir}/saj"/> + <copy todir="${product.dir}/saj"> + <fileset dir="${product.dir}/bj"> + <include name="*.jar"/> + </fileset> -+ </copy> ++ </copy> + <jar basedir="${classes-j.dir}" compress="${build.compress}" jarfile="${product.dir}/saj/saxon9sa.jar"> + <include name="net/**/*.class"/> + <exclude name="**/dom/**/*.class"/> @@ -588,21 +588,21 @@ + <include name="net/sf/saxon/ant/*.class"/> + </jar> + </target> -+ ++ + <target name="jar-bn" description="Create Saxon-B jar files for .NET" depends="compile-bn"> + <mkdir dir="${jar-n.dir}"/> + <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9.jar"> + <include name="net/**/*.class"/> + </jar> + </target> -+ ++ + <target name="jar-san" description="Create Saxon-SA jar files for .NET" depends="compile-san"> + <mkdir dir="${jar-n.dir}"/> + <jar basedir="${classes-n.dir}" compress="${build.compress}" jarfile="${jar-n.dir}/saxon9sa.jar"> + <include name="com/saxonica/**/*.class"/> + </jar> + </target> -+ ++ + <target name="dll-n" description="Create DLLs for .NET" depends="jar-bn, jar-san"> + <mkdir dir="${dll-n.dir}"/> + <copy todir="${dll-n.dir}"> @@ -614,7 +614,7 @@ + <copy file="${saxondotnet.snk}" todir="${basedir}"/> + <!-- + Invoke IKVMC to cross-compile the JAR files into DLLs -+ --> ++ --> + <exec dir="." executable="ikvmc.cmd" > + <arg line="live"/> <!-- set to 'debug' for testing, 'live' for final build --> + <arg line="${basedir}/${jar-n.dir}"/> @@ -622,7 +622,7 @@ + <arg line="${version}"/> + </exec> + </target> -+ ++ + <target name="csharp-n" description="Compile C# source for .NET commands and API library" + depends="dll-n"> + @@ -635,7 +635,7 @@ + <arg line="${version}"/> + </exec> + -+ ++ +<!-- <taskdef + uri="antlib:org.apache.ant.dotnet"> + <classpath> @@ -662,9 +662,9 @@ + <reference file="${dll-n.dir}/IKVM.GNU.Classpath.dll"/> + <reference file="${dll-n.dir}/IKVM.Runtime.dll"/> + <reference file="${dll-n.dir}/saxon9.dll"/> -+ <reference file="${dll-n.dir}/saxon9sa.dll"/> ++ <reference file="${dll-n.dir}/saxon9sa.dll"/> + </dn:csc> -+--> ++--> + </target> + + <target name="basic-userdoc" description="Generate Basic Documentation for release with executable"> @@ -695,8 +695,8 @@ + <include name="doc/**"/> + <include name="notices/**"/> + </fileset> -+ </copy> -+ </target> ++ </copy> ++ </target> + + <target name="product-bn" description="Assemble product.directory for Saxon-B on .NET" + depends="csharp-n, dll-n, basic-userdoc"> @@ -717,7 +717,7 @@ + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll + %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9api.dll ++ %NET%\gacutil /if saxon9api.dll + </echo> + </target> + @@ -740,10 +740,10 @@ + set NET="%PROGRAMFILES%\Microsoft.NET\SDK\v1.1\Bin" + %NET%\gacutil /if IKVM.Runtime.dll + %NET%\gacutil /if IKVM.GNU.Classpath.dll -+ %NET%\gacutil /if saxon9.dll -+ %NET%\gacutil /if saxon9sa.dll -+ %NET%\gacutil /if saxon9api.dll -+ </echo> ++ %NET%\gacutil /if saxon9.dll ++ %NET%\gacutil /if saxon9sa.dll ++ %NET%\gacutil /if saxon9api.dll ++ </echo> + </target> + + <target name="samples" description="Assemble Cross-Platform Samples and Use-Cases"> @@ -765,7 +765,7 @@ + </fileset> + </copy> + </target> -+ ++ + <target name="samples-j" description="Copy and Compile Java Samples" + depends="jar-saj"> + <mkdir dir="${product.dir}/resources/samples/java"/> @@ -791,57 +791,57 @@ + <include name="XQJExamples.java"/> + </fileset> + </copy> -+ <javac debug="true" debuglevel="source, lines" ++ <javac debug="true" debuglevel="source, lines" + destdir="${product.dir}/resources/samples/java/classes" + srcdir="${product.dir}/resources/samples/java" + source="${build.compiler.source}" + target="${build.compiler.target}"> -+ <include name="*.java"/> ++ <include name="*.java"/> + <classpath> + <path refid="classpath-samples"/> + </classpath> -+ </javac> ++ </javac> + </target> + + <target name="testdrivers-j" description="Copy Java Test Drivers"> + <mkdir dir="${product.dir}/resources/drivers/java/test"/> + <copy todir="${product.dir}/resources/drivers/java/test"> + <fileset dir="${drivers-j.dir}"> -+ <include name="XQueryTestSuiteDriver.java"/> -+ <include name="XsltTestSuiteDriver.java"/> ++ <include name="XQueryTestSuiteDriver.java"/> ++ <include name="XsltTestSuiteDriver.java"/> + <include name="CanonicalXML.java"/> -+ <include name="XQTSModuleURIResolver.java"/> -+ <include name="XQTSCollectionURIResolver.java"/> -+ <include name="SchemaTestSuiteDriver.java"/> ++ <include name="XQTSModuleURIResolver.java"/> ++ <include name="XQTSCollectionURIResolver.java"/> ++ <include name="SchemaTestSuiteDriver.java"/> + </fileset> + </copy> -+ </target> ++ </target> + + <target name="samples-n" description="Assemble release samples for .NET" + depends="csharp-n"> + <mkdir dir="${build-resources.dir}/samples/cs"/> -+ <copy todir="${build-resources.dir}/samples/cs"> ++ <copy todir="${build-resources.dir}/samples/cs"> + <fileset dir="${temp-src-nc.dir}/samples"> + <include name="*.cs"/> + </fileset> + </copy> + <mkdir dir="${build-resources.dir}/samples/cs/bin"/> -+ <copy todir="${build-resources.dir}/samples/cs/bin"> ++ <copy todir="${build-resources.dir}/samples/cs/bin"> + <fileset dir="${dll-n.dir}/samples"> + <include name="*.exe"/> + <include name="*.dll"/> + <include name="*.pdb"/> + </fileset> + </copy> -+ <copy todir="${build-resources.dir}/samples/cs/bin"> ++ <copy todir="${build-resources.dir}/samples/cs/bin"> + <fileset dir="${dll-n.dir}/tests"> + <include name="*.exe"/> + <include name="*.dll"/> + <include name="*.pdb"/> + </fileset> -+ </copy> -+ </target> -+ ++ </copy> ++ </target> ++ + <target name="product-javadoc" description="Generate Javadoc."> + <javadoc bottom="Copyright (C) Michael H. Kay. All rights reserved." + destdir="${javadoc.dir}" doctitle="saxon9 Javadocs" @@ -859,28 +859,28 @@ + + <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/> + <link href="http://www.xom.nu/apidocs/"/> -+ ++ + </javadoc> + <copy file="${userdoc.dir}/fixed/javadoc/stylesheet.css" + tofile="${javadoc.dir}/stylesheet.css" + overwrite="true"/> + </target> -+ ++ + <target name="product-dotnetdoc" description="Copy .NET API documentation"> + <mkdir dir="${build-resources.dir}/doc/dotnetdoc"/> + <copy todir="${build-resources.dir}/doc/dotnetdoc"> + <fileset dir="${dotnetdoc.dir}"/> + </copy> -+ </target> -+ -+ ++ </target> ++ ++ + <target name="release-userdoc" description="Generate User Documentation"> + <taskdef name="saxon-xslt" + classname="net.sf.saxon.ant.AntTransform" + classpath="c:\saxon-build\9.0.0.1\saj\saxon9sa.jar;c:\saxon-licenses"/> + <copy todir="${build-resources.dir}/doc"> + <fileset dir="${userdoc.dir}/fixed"/> -+ </copy> ++ </copy> + <copy todir="${product.dir}/bj"> + <fileset dir="${userdoc.dir}/welcome"> + <include name="doc/**"/> @@ -904,7 +904,7 @@ + <include name="doc/**"/> + <include name="notices/**"/> + </fileset> -+ </copy> ++ </copy> + <saxon-xslt in="${userdoc.dir}/catalog.xml" + style="${userdoc.dir}/render-page2.xsl" + schemaAware="true" @@ -922,9 +922,9 @@ + <include name="fixed/**"/> + <include name="welcome/**"/> + </fileset> -+ </zip> ++ </zip> + </target> -+ ++ + <target name="release-source" description="Generate Zip file containing issued Source Code"> + <mkdir dir="${build-resources.dir}"/> + <zip zipfile="${build-resources.dir}/source.zip"> @@ -935,11 +935,11 @@ + <fileset dir="${source-bj.dir}"> + <include name="net/sf/saxon/dotnet/*.java"/> + <include name="net/sf/saxon/dotnet/package.html"/> -+ </fileset> ++ </fileset> + <fileset dir="${temp-src-nc.dir}"> + <include name="api/**/*.cs"/> + <include name="cmd/**/*.cs"/> -+ </fileset> ++ </fileset> + </zip> + <zip zipfile="${build-resources.dir}/sa-source.zip"> + <fileset dir="${source-saj.dir}"> @@ -948,7 +948,7 @@ + </fileset> + </zip> + </target> -+ ++ + <target name="resources" description="Generate contents of released resources file" + depends="release-userdoc, product-javadoc, product-dotnetdoc, + samples, samples-j, testdrivers-j, samples-n, release-source"> @@ -966,7 +966,7 @@ + </fileset> + </copy> + </target> -+ ++ + <target name="bj" depends="compile-bj, jar-bj, basic-userdoc" + description="Generate Saxon-B for the Java platform"/> + @@ -974,7 +974,7 @@ + description="Generate Saxon-SA for the Java platform"/> + + <target name="n" depends="product-bn, product-san" -+ description="Generate Saxon for the .NET platform"/> ++ description="Generate Saxon for the .NET platform"/> + + <target name="build" description="Complete Saxon product build" + depends="bj, saj, n"/> <!-- add resources --> @@ -990,7 +990,7 @@ + </zip> + <zip zipfile="${issue.dir}/saxonsa${versionh}j.zip"> + <fileset dir="${product.dir}/saj"/> -+ </zip> ++ </zip> + <zip zipfile="${issue.dir}/saxonsa${versionh}n.zip"> + <fileset dir="${product.dir}/san"/> + </zip> @@ -1024,8 +1024,8 @@ + <zip zipfile="${archive.dir}/licenses.zip"> + <fileset dir="c:/saxon-licenses"/> + </zip> -+ </target> -+ -+ -+ ++ </target> ++ ++ ++ +</project> diff --git a/main/set_soenv.in b/main/set_soenv.in index 956c90e445..9e24f77a51 100644 --- a/main/set_soenv.in +++ b/main/set_soenv.in @@ -2138,7 +2138,6 @@ ToFile( "RAT_JAR_HOME", "@RAT_JAR_HOME@", "e" ); ToFile( "DMAKE_URL", "@DMAKE_URL@", "e" ); ToFile( "DMAKE_PATH", "@DMAKE_PATH@", "e" ); ToFile( "IS_SYSTEM_DMAKE", "@IS_SYSTEM_DMAKE@", "e" ); -ToFile( "BUILD_STAX", "@BUILD_STAX@", "e" ); ToFile( "BUILD_UNOWINREG", "@BUILD_UNOWINREG@", "e" ); ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" ); ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" ); diff --git a/main/stax/download/README_stax-1.2.0.jar.txt b/main/stax/download/README_stax-1.2.0.jar.txt deleted file mode 100644 index c2f4365afb..0000000000 --- a/main/stax/download/README_stax-1.2.0.jar.txt +++ /dev/null @@ -1,13 +0,0 @@ -The JSR173 is the XML pull API used at build time for the Saxon-B -XSLT processor: it has become part of OpenJDK 6. - -When using an older JDK, you can get the API from - http://dist.codehaus.org/stax/jars/ -located at the StAX Home site - http://stax.codehaus.org/ -and put it under stax/download. - -1.2 Release(final) is available under the Apache License 2.0. - -Checksum (for reference): -MD5 (stax-1.2.0.jar) = aa3439d235f7d999532b66bac56c1f87 diff --git a/main/stax/makefile.mk b/main/stax/makefile.mk deleted file mode 100644 index ed5955d0e5..0000000000 --- a/main/stax/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=. - -PRJNAME=stax -TARGET=stax -USE_JAVAVER=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk - -.IF "$(SOLAR_JAVA)" != "" -.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj" -all: - @echo "Your java version already contains StAX" -.ENDIF # "$(JAVANUMVER:s/.//)" >= "000100060000" -.IF "$(SYSTEM_SAXON)" == "YES" -all: - @echo "An already available installation of saxon should exist on your system." - @echo "Therefore the files provided here does not need to be built in addition." -.ENDIF - -.IF "$(BUILD_STAX)" != "YES" - -$(OUT)$/class$/stax-1.2.0.jar : $(PRJ)$/download$/stax-1.2.0.jar - +$(COPY) $< $@ - -.ELSE # "$(BUILD_STAX)" != "YES" - -# --- Files -------------------------------------------------------- -TARFILE_NAME=stax-src-1.2.0 -TARFILE_MD5=980143f96b3f6ce45d2e4947da21a5e9 -TARFILE_ROOTDIR=src - -# $(JAVA_TARGET_FLAG) pins bytecode to the Java 8 floor (settings.mk); this raw -# javac call would otherwise emit bytecode for whatever the build JDK defaults to. -BUILD_ACTION=$(JAVAC) $(JAVA_TARGET_FLAG) javax$/xml$/stream$/*.java && jar -cf stax-1.2.0.jar javax$/xml$/stream$/*.class javax$/xml$/stream$/events$/*.class javax$/xml$/stream$/util$/*.class - -OUT2CLASS=stax-1.2.0.jar -.ENDIF # "$(BUILD_STAX)" != "YES" - -.ELSE # $(SOLAR_JAVA)!= "" -nojava: - @echo "Not building $(PRJNAME) because Java is disabled" -.ENDIF # $(SOLAR_JAVA)!= "" -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.ENDIF diff --git a/main/stax/prj/build.lst b/main/stax/prj/build.lst deleted file mode 100644 index cbfc6ea3ba..0000000000 --- a/main/stax/prj/build.lst +++ /dev/null @@ -1,2 +0,0 @@ -tx stax : solenv NULL -tx stax nmake - all tx_stax NULL diff --git a/main/stax/prj/d.lst b/main/stax/prj/d.lst deleted file mode 100644 index 4345d5b884..0000000000 --- a/main/stax/prj/d.lst +++ /dev/null @@ -1 +0,0 @@ -..\%__SRC%\class\stax*.jar %_DEST%\bin%_EXT%
