From 725eba738eae4eee6cd9b833d375db5463833119 Mon Sep 17 00:00:00 2001
From: David Tardon
Date: Wed, 10 Oct 2012 17:42:46 +0200
Subject: remove all traces of saxon
Change-Id: I33ca2c27d557d24e3900d7ebf8f3ea2d99b3cfb0
---
Makefile.top | 2 -
Module_tail_build.mk | 1 -
RepositoryExternal.mk | 17 -
RepositoryModule_ooo.mk | 1 -
config_host.mk.in | 4 -
configure.ac | 134 -----
filter/prj/build.lst | 2 +-
ooo.lst.in | 6 -
readlicense_oo/html/LICENSE.html | 14 +-
readlicense_oo/txt/NOTICE | 5 -
readlicense_oo/txt/license.txt | 14 -
saxon/ExternalProject_saxon.mk | 37 --
saxon/Makefile | 7 -
saxon/Module_saxon.mk | 22 -
saxon/Package_saxon.mk | 16 -
saxon/README | 1 -
saxon/UnpackedTarball_saxon.mk | 16 -
saxon/build.xml | 1015 --------------------------------------
saxon/prj/build.lst | 2 -
saxon/prj/d.lst | 0
stax/README | 1 -
stax/makefile.mk | 78 ---
stax/prj/build.lst | 2 -
stax/prj/d.lst | 1 -
stax/prj/dmake | 0
tail_build/prj/build.lst | 2 +-
26 files changed, 3 insertions(+), 1397 deletions(-)
delete mode 100644 saxon/ExternalProject_saxon.mk
delete mode 100644 saxon/Makefile
delete mode 100644 saxon/Module_saxon.mk
delete mode 100644 saxon/Package_saxon.mk
delete mode 100644 saxon/README
delete mode 100644 saxon/UnpackedTarball_saxon.mk
delete mode 100644 saxon/build.xml
delete mode 100644 saxon/prj/build.lst
delete mode 100644 saxon/prj/d.lst
delete mode 100644 stax/README
delete mode 100644 stax/makefile.mk
delete mode 100644 stax/prj/build.lst
delete mode 100644 stax/prj/d.lst
delete mode 100644 stax/prj/dmake
diff --git a/Makefile.top b/Makefile.top
index 1d50dd2db6b3..aa1e25f515cd 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -142,7 +142,6 @@ sal\
salhelper\
sane\
sax\
-saxon\
sc\
scaddins\
sccomp\
@@ -245,7 +244,6 @@ postprocess\
python\
redland\
setup_native\
-stax\
stlport\
sysui\
xpdf\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 57a7dc8075df..ddd18027a71e 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
salhelper \
sane \
sax \
- $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 426015063f1e..11440feabc7d 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2268,23 +2268,6 @@ endef
endif # SYSTEM_HSQLDB
-ifeq ($(SYSTEM_SAXON),YES)
-
-define gb_Jar__use_saxon
-$(call gb_Jar_use_system_jar,$(1),$(SAXON_JAR))
-endef
-
-else # !SYSTEM_SAXON
-
-$(eval $(call gb_Helper_register_jars,OOO,\
- saxon9 \
-))
-
-define gb_Jar__use_saxon
-$(call gb_Jar_use_jar,$(1),saxon9)
-endef
-
-endif # SYSTEM_SAXON
ifeq ($(SYSTEM_BSH),YES)
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 65a9fd9f58f9..616b3cf65099 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -143,7 +143,6 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
salhelper \
sane \
sax \
- $(call gb_Helper_optional,SAXON,saxon) \
sc \
scaddins \
sccomp \
diff --git a/config_host.mk.in b/config_host.mk.in
index 62c4ff786c84..5a2317247590 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -43,7 +43,6 @@ export BUILD_MOZAB=@BUILD_MOZAB@
export BUILD_NCPUS=@BUILD_NCPUS@
export BUILD_PLATFORM=@build@
export BUILD_POSTGRESQL_SDBC=@BUILD_POSTGRESQL_SDBC@
-export BUILD_STAX=@BUILD_STAX@
export BUILD_TYPE=@BUILD_TYPE@
export BUILD_UNOWINREG=@BUILD_UNOWINREG@
export BUILD_VER_STRING=@BUILD_VER_STRING@
@@ -525,8 +524,6 @@ export JFREEREPORT_LIBSERIALIZER_TARBALL=@JFREEREPORT_LIBSERIALIZER_TARBALL@
export JFREEREPORT_FLOW_ENGINE_TARBALL=@JFREEREPORT_FLOW_ENGINE_TARBALL@
export JFREEREPORT_LIBLAYOUT_TARBALL=@JFREEREPORT_LIBLAYOUT_TARBALL@
export SAL_ENABLE_FILE_LOCKING=1
-export SAXON_JAR=@SAXON_JAR@
-export SAXON_TARBALL=@SAXON_TARBALL@
export SCPDEFS=@SCPDEFS@
export SERVLETAPI_JAR=@SERVLETAPI_JAR@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
@@ -625,7 +622,6 @@ export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
export SYSTEM_PYTHON=@SYSTEM_PYTHON@
export SYSTEM_REDLAND=@SYSTEM_REDLAND@
export SYSTEM_RHINO=@SYSTEM_RHINO@
-export SYSTEM_SAXON=@SYSTEM_SAXON@
export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@
export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@
export SYSTEM_VIGRA=@SYSTEM_VIGRA@
diff --git a/configure.ac b/configure.ac
index 969e6b0a0622..e67a81727d0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1580,15 +1580,6 @@ AC_ARG_WITH(libbase-jar,
[Specify path to jarfile manually.]),
LIBBASE_JAR=$withval)
-AC_ARG_WITH(system-saxon,
- AS_HELP_STRING([--with-system-saxon],
- [Use saxon already on system.]))
-
-AC_ARG_WITH(saxon-jar,
- AS_HELP_STRING([--with-saxon-jar=JARFILE],
- [Specify path to jarfile manually.]),
- SAXON_JAR=$withval)
-
AC_ARG_WITH(system-odbc,
AS_HELP_STRING([--with-system-odbc],
[Use the odbc headers already on system.]),,
@@ -7840,131 +7831,6 @@ AC_SUBST(POSTGRESQL_INC)
AC_SUBST(POSTGRESQL_LIB)
AC_SUBST(POSTGRESQL_TARBALL)
-
-dnl ===================================================================
-dnl Check for system saxon
-dnl ===================================================================
-if test "$with_java" != "no"; then
-AC_MSG_CHECKING([which saxon to use])
-if test "$with_system_saxon" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_SAXON=YES
- if test -z $SAXON_JAR; then
- AC_CHECK_FILE(/usr/share/java/saxon9.jar,
- [ SAXON_JAR=/usr/share/java/saxon9.jar ],
- [
- AC_CHECK_FILE(/usr/share/java/saxon.jar,
- [ SAXON_JAR=/usr/share/java/saxon.jar ],
- [ AC_CHECK_FILE(/usr/share/java/saxon9.jar,
- [ SAXON_JAR=/usr/share/java/saxon9.jar ],
- [ AC_MSG_ERROR(saxon.jar replacement not found)]
- )
- ]
- )
- ]
- )
- else
- AC_CHECK_FILE($SAXON_JAR, [],
- [AC_MSG_ERROR(saxon.jar replacement not found.)], [])
- fi
-
- dnl Saxon comes in two practically available versions, the out-of-date saxonb which
- dnl supports the Java extensions that LibreOffice uses, and the up-to-date saxon he
- dnl "home edition" version, which is crippled to not support those Java extensions.
- dnl And as an aside the he one also needs to be tweaked to include
- dnl a META-INF/services to broadcast that it supports the jaxp transform factory
-
- AC_MSG_CHECKING([if saxon works])
- cat > saxontest.java <<_ACEOF
-[import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.stream.StreamSource;
-import java.io.*;
-
-import net.sf.saxon.FeatureKeys;
-
-class saxontest {
- public static void main(String[] args) {
- System.setProperty("javax.xml.transform.TransformerFactory",
- "net.sf.saxon.TransformerFactoryImpl");
- try {
- TransformerFactory tfactory = TransformerFactory.newInstance();
- // some external saxons (Debian, Ubuntu, ...) have this disabled
- // per default
- tfactory.setAttribute(FeatureKeys.ALLOW_EXTERNAL_FUNCTIONS, new Boolean(true));
- System.out.println("TransformerFactory is" +
- tfactory.getClass().getName());
- Transformer transformer = tfactory.newTransformer(
- new StreamSource(new File(args[0])));
- } catch(Exception e){
- e.printStackTrace(System.err);
- System.exit(-1);
- }
- System.exit(0);
- }
-}
-]
-_ACEOF
-
- cat > saxontest.xsl<<_ACEOF
-[
-
-
-
-
-
-]
-_ACEOF
-
- javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2"
- AC_TRY_EVAL(javac_cmd)
- if test $? = 0 -a -f ./saxontest.class; then
- java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2"
- AC_TRY_EVAL(java_cmd)
- if test $? = 0; then
- AC_MSG_RESULT([yes])
- else
- cat saxontest.java >&5
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb])
- fi
- else
- AC_MSG_RESULT([no])
- cat saxontest.java >&5
- AC_MSG_ERROR([saxontest could not be compiled, non-functional saxon jar])
- fi
-else
- AC_MSG_RESULT([internal])
- SYSTEM_SAXON=NO
- NEED_SAXON=TRUE
- SAXON_TARBALL=ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-fi
-fi
-AC_SUBST(SYSTEM_SAXON)
-AC_SUBST(SAXON_TARBALL)
-AC_SUBST(SAXON_JAR)
-
-if test -n "$NEED_SAXON"; then
- BUILD_TYPE="$BUILD_TYPE SAXON"
-fi
-
-# ===================================================================
-# Check whether to build stax
-# ===================================================================
-AC_MSG_CHECKING([whether building the stax is required])
-BUILD_STAX=NO
-if test -z "$SOLAR_JAVA"; then
- AC_MSG_RESULT([no (java disabled)])
-elif test "$SYSTEM_SAXON" = "YES"; then
- AC_MSG_RESULT([no (already provided by system saxon)])
-elif test -f "./stax/download/jsr173_1.0_api.jar"; then
- AC_MSG_RESULT([no (will use the prebuilt stax/download/jsr173_1.0_api.jar)])
-else
- BUILD_STAX=YES
- AC_MSG_RESULT([yes (no system saxon and no prebuilt copy)])
-fi
-AC_SUBST(BUILD_STAX)
-
dnl ===================================================================
dnl Check for system curl
dnl ===================================================================
diff --git a/filter/prj/build.lst b/filter/prj/build.lst
index 9083dc77766a..2319f396ac04 100644
--- a/filter/prj/build.lst
+++ b/filter/prj/build.lst
@@ -1,2 +1,2 @@
-fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas SAXON:saxon LIBXSLT:libxslt basegfx package PYTHON:python NULL
+fl filter : TRANSLATIONS:translations svtools unotools xmloff cppu tools cppuhelper sal salhelper svx javaunohelper XPDF:xpdf jvmaccess canvas LIBXSLT:libxslt basegfx package PYTHON:python NULL
fl filter\prj nmake - all fl_prj NULL
diff --git a/ooo.lst.in b/ooo.lst.in
index 755daa994afc..b2fd401847c6 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -6,21 +6,17 @@ c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html
26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
284e768eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz
35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz
599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
7740a8ec23878a2f50120e1faa2730f2-libxml2-2.7.6.tar.gz
7376930b0d3f3d77a685d94c4a3acda8-STLport-4.5-0119.tar.gz
3fa4d5236f2a36ca5c3af6715e837691-curl-7.26.0.tar.gz
-8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar
fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz
-a4d9b30810a434a3ed39fc0003bbd637-LICENSE_stax-api-1.0-2-sources.html
bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1
c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz
ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
@@ -30,7 +26,6 @@ e0707ff896045731ff99e99799606441-README_db-4.7.25.NC-custom.txt
e81c2f0953aa60f8062c05a4673f2be0-Python-2.6.1.tar.bz2
e61d0364a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz
dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
-fb7ba5c2182be4e73748859967455455-README_stax-api-1.0-2-sources.txt
fca8706f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
@POSTGRESQL_TARBALL@
@@ -91,7 +86,6 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2
@ORCUS_TARBALL@
@PNG_TARBALL@
@RHINO_TARBALL@
-@SAXON_TARBALL@
@TOMCAT_TARBALL@
@VIGRA_TARBALL@
@VISIO_TARBALL@
diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/html/LICENSE.html
index 7753ed92fddc..6c87f3943f31 100644
--- a/readlicense_oo/html/LICENSE.html
+++ b/readlicense_oo/html/LICENSE.html
@@ -2110,18 +2110,6 @@ FITNESS FOR A PARTICULAR PURPOSE.
This
file declares SANE application interface. See the SANE standard for a
detailed explanation of the interface.
-Saxon (B)
-The
-following software may be included in this product: Saxon (B). Use of
-any of this software is governed by the terms of the license below:
-Jump
-to MPL Version 1.1
-Stax
-The
-following software may be included in this product: Stax API. Use of
-any of this software is governed by the terms of the license below:
-Jump
-to Apache License Version 2.0
STLPort
The
following software may be included in this product:STLport. Use of
@@ -9471,4 +9459,4 @@ this trademark restriction does not form part of the License.
Creative
Commons may be contacted at http://creativecommons.org/.