summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2013-02-02 15:44:30 -0500
committerPeter Foley <pefoley2@verizon.net>2013-02-05 19:47:04 +0000
commit856c075e93683cec7cff02e0cf0d6ed31f937a98 (patch)
tree34c18b042583274e8c295cd0b7d590df0ff8015f
parent7d3ddc2c6cc39fdd671f08059528464675cd6ecc (diff)
convert libxslt to gbuild and add to tail_build
Change-Id: I16eb442fd65b3a2f3a44108f670fd364dc7a64c0 Reviewed-on: https://gerrit.libreoffice.org/1988 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
-rw-r--r--Module_tail_build.mk1
-rw-r--r--RepositoryExternal.mk12
-rw-r--r--RepositoryModule_ooo.mk1
-rw-r--r--config_host.mk.in1
-rw-r--r--configure.ac2
-rw-r--r--libxslt/ExternalPackage_xslt.mk51
-rw-r--r--libxslt/ExternalProject_xslt.mk55
-rw-r--r--libxslt/Makefile7
-rw-r--r--libxslt/Module_libxslt.mk22
-rw-r--r--libxslt/UnpackedTarball_xslt.mk25
-rwxr-xr-xlibxslt/dummy/bin/xml2-config17
-rw-r--r--libxslt/libxslt-vc10.patch12
-rw-r--r--libxslt/libxsltversion.mk36
-rw-r--r--libxslt/makefile.mk201
-rw-r--r--libxslt/prj/build.lst3
-rw-r--r--libxslt/prj/d.lst23
-rw-r--r--libxslt/prj/dmake0
-rw-r--r--scp2/InstallModule_ooo.mk2
-rw-r--r--tail_build/prj/build.lst2
-rw-r--r--writerfilter/CustomTarget_source.mk2
20 files changed, 191 insertions, 284 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 7bcba457a439..0df5ac2de156 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
libxmlsec \
+ $(call gb_Helper_optional,LIBXSLT,libxslt) \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f30756b3239c..785b680541c4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -694,6 +694,11 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_libxslt
+$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(call gb_UnpackedTarball_get_dir,xslt) \
+)
$(call gb_LinkTarget_use_libraries,$(1),\
xslt \
)
@@ -701,6 +706,12 @@ $(call gb_LinkTarget_use_libraries,$(1),\
endef
define gb_LinkTarget__use_libexslt
+$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(call gb_UnpackedTarball_get_dir,xslt) \
+)
+
$(call gb_LinkTarget_use_libraries,$(1),\
exslt \
)
@@ -2696,6 +2707,7 @@ else # ! SYSTEM_LIBXSLT_FOR_BUILD
define gb_ExternalExecutable__register_xsltproc
$(call gb_ExternalExecutable_set_internal,xsltproc)
+$(call gb_ExternalExecutable_add_dependencies,xsltproc,$(call gb_Package_get_target,xslt))
endef
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 60a0f4eb92d6..d1c312f8d4d6 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -123,6 +123,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
libxmlsec \
+ $(call gb_Helper_optional,LIBXSLT,libxslt) \
lingucomponent \
linguistic \
lotuswordpro \
diff --git a/config_host.mk.in b/config_host.mk.in
index 22f923d95001..f780655d36be 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -317,6 +317,7 @@ export LIBXML_JAR=@LIBXML_JAR@
export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
+export LIBXSLT_MAJOR=@LIBXSLT_MAJOR@
export LINK_X64_BINARY=@LINK_X64_BINARY@
@x_Cygwin@ export LS=@WIN_LS@
export MANDIR=@MANDIR@
diff --git a/configure.ac b/configure.ac
index c4ed1dd2df92..b510cac6add3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7470,6 +7470,7 @@ if test "$with_system_libxml" = "yes"; then
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
+ LIBXSLT_MAJOR=1
BUILD_TYPE="$BUILD_TYPE LIBXSLT"
if test "$cross_compiling" = "yes"; then
@@ -7489,6 +7490,7 @@ AC_SUBST(LIBEXSLT_CFLAGS)
AC_SUBST(LIBEXSLT_LIBS)
AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
+AC_SUBST(LIBXSLT_MAJOR)
AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBEXSLT_DLL])
AC_SUBST([MINGW_LIBXSLT_DLL])
diff --git a/libxslt/ExternalPackage_xslt.mk b/libxslt/ExternalPackage_xslt.mk
new file mode 100644
index 000000000000..056de0a7a529
--- /dev/null
+++ b/libxslt/ExternalPackage_xslt.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt))
+
+$(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt))
+
+ifneq ($(COM),MSC)
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xslt-config,xslt-config))
+endif
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.1.26.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dylib,libxslt/.libs/libxslt.1.1.26.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.8.15.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dylib,libexslt/.libs/libexslt.0.8.15.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
+else ifeq ($(DISABLE_DYNLOADING),TRUE)
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.a,libxslt/.libs/libxslt.a))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.a,libexslt/.libs/libexslt.a))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
+else ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.dll.a,libxslt/.libs/libxslt.dll.a))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.dll.a,libexslt/.libs/libexslt.dll.a))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,xsltproc/.libs/xsltproc.exe))
+else # COM=MSC
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.lib,win32/bin.msvc/libxslt.lib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.lib,win32/bin.msvc/libexslt.lib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc.exe,win32/bin.msvc/xsltproc.exe))
+endif
+else # OS!=WNT
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so.1.1.26,libxslt/.libs/libxslt.so.1.1.26))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libxslt.so,libxslt/.libs/libxslt.so.1.1.26))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so.0.8.15,libexslt/.libs/libexslt.so.0.8.15))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15))
+$(eval $(call gb_ExternalPackage_add_file,xslt,lib/libexslt.so,libexslt/.libs/libexslt.so.0.8.15))
+$(eval $(call gb_ExternalPackage_add_file,xslt,bin/xsltproc,xsltproc/.libs/xsltproc))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
new file mode 100644
index 000000000000..42bf57a58140
--- /dev/null
+++ b/libxslt/ExternalProject_xslt.mk
@@ -0,0 +1,55 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,xslt))
+
+$(eval $(call gb_ExternalProject_use_unpacked,xslt,xslt))
+
+$(eval $(call gb_ExternalProject_register_targets,xslt,\
+ build \
+))
+ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(call gb_ExternalProject_get_state_target,xslt,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure --without-crypto --without-python --disable-static \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
+ $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \
+ LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2" \
+ OBJDUMP=objdump \
+ && chmod 777 xslt-config \
+ && $(MAKE) \
+ && touch $@
+else # COM=MSC
+$(call gb_ExternalProject_get_state_target,xslt,build):
+ cd $(EXTERNAL_WORKDIR)/win32 \
+ && cscript configure.js \
+ && unset MAKEFLAGS \
+ && LIB="$(ILIB)" nmake \
+ && touch $@
+endif
+else # OS!=WNT
+$(call gb_ExternalProject_get_state_target,xslt,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure --without-crypto --without-python \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ LDFLAGS="$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl$(COMMA)-noinhibit-exec) \
+ $(if $(SYSBASE),$(if $(filter SOLARIS LINUX,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \
+ $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
+ $(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
+ $(if $(filter IOS,$(OS)),LIBS="-liconv") \
+ --disable-shared,--disable-static) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \
+ && chmod 777 xslt-config \
+ && $(MAKE) \
+ && touch $@
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/libxslt/Makefile b/libxslt/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/libxslt/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/libxslt/Module_libxslt.mk b/libxslt/Module_libxslt.mk
new file mode 100644
index 000000000000..b43a224ba0aa
--- /dev/null
+++ b/libxslt/Module_libxslt.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,libxslt))
+
+ifeq ($(SYSTEM_LIBXSLT),NO)
+
+$(eval $(call gb_Module_add_targets,libxslt,\
+ ExternalPackage_xslt \
+ ExternalProject_xslt \
+ UnpackedTarball_xslt \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/libxslt/UnpackedTarball_xslt.mk b/libxslt/UnpackedTarball_xslt.mk
new file mode 100644
index 000000000000..dad41d8487f4
--- /dev/null
+++ b/libxslt/UnpackedTarball_xslt.mk
@@ -0,0 +1,25 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,xslt,\
+ libxslt/libxslt-configure.patch \
+ libxslt/libxslt-win_manifest.patch \
+ libxslt/libxslt-mingw.patch \
+ libxslt/libxslt-internal-symbols.patch \
+ libxslt/libxslt-aix.patch \
+ libxslt/libxslt-vc10.patch \
+ libxslt/libxslt-1.1.26-memdump.patch \
+ $(if $(filter ANDROID,$(OS)),libxslt/libxslt-android.patch) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libxslt/dummy/bin/xml2-config b/libxslt/dummy/bin/xml2-config
deleted file mode 100755
index 4ee8dd0206c5..000000000000
--- a/libxslt/dummy/bin/xml2-config
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Use flags found out by configure when we *don't* want
-# to use the "system" xml2-config in $PATH
-
-case $1 in
---cflags)
- echo $LIBXML_CFLAGS
- ;;
---libs)
- echo $LIBXML_LIBS
- ;;
---version)
- # Assume it's close enough to the system version...
- xml2-config --version
- ;;
-esac
diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch
index 3d8b3302c643..d9479f7fb5b5 100644
--- a/libxslt/libxslt-vc10.patch
+++ b/libxslt/libxslt-vc10.patch
@@ -1,5 +1,13 @@
---- misc/build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200
-+++ misc/build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200
+--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200
++++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200
+@@ -54,6 +54,7 @@
+ CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
+ CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
+ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
++CFLAGS = $(CFLAGS) $(SOLARINC)
+
+ # The linker and its options.
+ LD = link.exe
@@ -71,8 +71,12 @@
LDFLAGS = $(LDFLAGS) /DEBUG
!else
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
deleted file mode 100644
index e7fe5e5af7c3..000000000000
--- a/libxslt/libxsltversion.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# major
-LIBXSLT_MAJOR=1
-LIBEXSLT_MAJOR=0
-# minor
-LIBXSLT_MINOR=1
-LIBEXSLT_MINOR=8
-# micro
-LIBXSLT_MICRO=26
-LIBEXSLT_MICRO=15
-
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
deleted file mode 100644
index 691c50b29f62..000000000000
--- a/libxslt/makefile.mk
+++ /dev/null
@@ -1,201 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=.
-
-PRJNAME=libxslt
-TARGET=so_libxslt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_LIBXSLT)" == "YES"
-all:
- @echo "An already available installation of libxslt should exist on your system."
- @echo "Therefore the version provided here does not need to be built in addition."
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(L10N_framework)"==""
-
-.INCLUDE : libxsltversion.mk
-
-LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
-
-TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
-
-# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
-PATCH_FILES=libxslt-configure.patch \
- libxslt-win_manifest.patch \
- libxslt-mingw.patch \
- libxslt-internal-symbols.patch \
- libxslt-aix.patch \
- libxslt-vc10.patch \
- libxslt-1.1.26-memdump.patch
-
-.IF "$(OS)"=="ANDROID"
-PATCH_FILES+= libxslt-android.patch
-.ENDIF
-
-# This is only for UNX environment now
-.IF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-xslt_CC=$(CC) -mthreads
-.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
-xslt_CC+=-shared-libgcc
-.ENDIF
-xslt_LIBS=
-.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
-xslt_LIBS+=$(MINGW_SHARED_LIBSTDCPP)
-.ENDIF
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-.IF "$(CROSS_COMPILING)"=="YES"
-BUILD_AND_HOST=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ELSE
-BUILD_AND_HOST=--build=i586-pc-mingw32 --host=i586-pc-mingw32
-.ENDIF
-.IF "$(ILIB)" == ""
-CONF_ILIB=
-.ELSE
-CONF_ILIB=-L$(ILIB:s/;/ -L/)
-.ENDIF
-CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no $(BUILD_AND_HOST) CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-Wl,--no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 $(CONF_ILIB)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
-BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.IF "$(OS)$(COM)"=="WNTGCC"
-.EXPORT : PWD
-.ENDIF
-.ELSE
-CONFIGURE_DIR=win32
-CONFIGURE_ACTION=cscript configure.js
-#CONFIGURE_FLAGS=iconv=no sax1=yes
-BUILD_ACTION=nmake
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-.ELSE
-
-.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-z,origin -Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(OS)$(COM)"=="SOLARISC52"
-LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
-.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
-.IF "$(OS)"=="AIX"
-LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(SYSBASE)"!=""
-CPPFLAGS+:=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include $(EXTRA_CFLAGS)
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
-LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
-.ENDIF
-.ENDIF # "$(SYSBASE)"!=""
-
-.EXPORT: CPPFLAGS
-.EXPORT: LDFLAGS
-.EXPORT: LIBXML2LIB
-
-.IF "$(COMNAME)"=="sunpro5"
-CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
-.ENDIF # "$(COMNAME)"=="sunpro5"
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=.$/configure
-
-.IF "$(DISABLE_DYNLOADING)" == "TRUE"
-.IF "$(OS)" == "IOS"
-CONFIGURE_ACTION+=LIBS=-liconv
-.ENDIF
-CONFIGURE_FLAGS=--disable-shared
-.ELSE
-CONFIGURE_FLAGS=--disable-static
-.ENDIF
-
-.IF "$(SYSTEM_LIBXML)"!="YES"
-# Use the xml2-config from our own libxml2 copy
-CONFIGURE_FLAGS+=--with-libxml-prefix=$(SOLARVER)/$(INPATH)
-.ENDIF
-
-CONFIGURE_FLAGS+=--enable-ipv6=no --without-crypto --without-python --with-sax1=yes
-
-.IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
-.ENDIF
-
-.IF "$(OS)" == "MACOSX"
-CONFIGURE_FLAGS += \
- --prefix=/@.__________________________________________________$(EXTRPATH)
-.ENDIF
-
-BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
-BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-BUILD_DIR=$(CONFIGURE_DIR)
-.ENDIF
-
-OUT2INC=libxslt$/*.h
-OUT2INC+=libexslt$/*.h
-
-.IF "$(OS)"=="MACOSX"
-OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
-OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
-OUT2BIN_NONE+=xsltproc$/.libs$/xsltproc
-OUT2BIN+=xslt-config
-.ELIF "$(DISABLE_DYNLOADING)" == "TRUE"
-OUT2LIB+=libxslt$/.libs$/libxslt.a
-OUT2LIB+=libexslt$/.libs$/libexslt.a
-OUT2BIN+=xslt-config
-.ELIF "$(OS)"=="WNT"
-.IF "$(COM)"=="GCC"
-OUT2LIB+=libxslt$/.libs$/*.a
-OUT2LIB+=libexslt$/.libs$/*.a
-OUT2BIN+=libxslt$/.libs$/*.dll
-OUT2BIN+=libexslt$/.libs$/*.dll
-OUT2BIN+=xsltproc$/.libs$/*.exe*
-OUT2BIN+=xslt-config
-.ELSE
-OUT2LIB+=win32$/bin.msvc$/*.lib
-OUT2BIN+=win32$/bin.msvc$/*.dll
-OUT2BIN+=win32$/bin.msvc$/*.exe
-.ENDIF
-.ELSE
-OUT2LIB+=libxslt$/.libs$/libxslt.so*
-OUT2LIB+=libexslt$/.libs$/libexslt.so*
-OUT2BIN+=xsltproc$/.libs$/xsltproc
-OUT2BIN+=xslt-config
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
diff --git a/libxslt/prj/build.lst b/libxslt/prj/build.lst
index f6e9eb049704..fa0e0102e951 100644
--- a/libxslt/prj/build.lst
+++ b/libxslt/prj/build.lst
@@ -1,3 +1,2 @@
lxslt libxslt : soltools LIBXML2:libxml2 NULL
-lxslt libxslt usr1 - all lxslt_mkout NULL
-lxslt libxslt nmake - all lxslt_libxslt NULL
+lxslt libxslt\prj nmake - all lxslt_libxslt NULL
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
index 383c5a30082b..e69de29bb2d1 100644
--- a/libxslt/prj/d.lst
+++ b/libxslt/prj/d.lst
@@ -1,23 +0,0 @@
-mkdir: %_DEST%\inc\external\libxslt
-mkdir: %_DEST%\inc\external\libexslt
-..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h
-..\%__SRC%\inc\exslt*.h %_DEST%\inc\external\libexslt\*.h
-..\%__SRC%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.1.dylib
-symlink: %_DEST%\lib\libxslt.1.dylib %_DEST%\lib\libxslt.dylib
-...\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
-..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1
-symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so
-..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so
-..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0
-symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so
-..\%__SRC%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.0.dylib
-symlink: %_DEST%\lib\libexslt.0.dylib %_DEST%\lib\libexslt.dylib
-..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so
-..\%__SRC%\lib\libexslt.lib %_DEST%\lib\libexslt.lib
-..\%__SRC%\lib\libexslt.a %_DEST%\lib\libexslt.a
-..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.*
-..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a
-..\%__SRC%\bin\lib*.dll %_DEST%\bin
-..\%__SRC%\bin\xsltproc* %_DEST%\bin
-..\%__SRC%\bin\xslt-config* %_DEST%\bin
-..\libxsltversion.mk %_DEST%\inc\libxsltversion.mk
diff --git a/libxslt/prj/dmake b/libxslt/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/libxslt/prj/dmake
+++ /dev/null
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 8c9a84d5b819..985865bebdf3 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -162,8 +162,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
ifneq ($(SYSTEM_LIBXSLT),YES)
-include $(OUTDIR)/inc/libxsltversion.mk
-
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
))
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5d1340647af7..363dc0841584 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : EXPAT:expat LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL
+tb tail_build : EXPAT:expat LIBXML2:libxml2 MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 XPDF:xpdf external solenv soltools NULL
tb tail_build\prj nmake - all tb_prj NULL
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index 0ffd8d95d20f..56fce46f5643 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -56,6 +56,8 @@ writerfilter_ALL = \
$(writerfilter_GEN_ooxml_NamespaceIds_hxx) \
$(writerfilter_GEN_ooxml_QNameToStr_cxx) \
$(writerfilter_GEN_ooxml_ResourceIds_hxx) \
+ $(writerfilter_GEN_ooxml_Model_processed) \
+ $(writerfilter_GEN_model_SprmCodeToStr_tmp) \
$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.hxx,$(writerfilter_OOXMLNAMESPACES)) \
$(patsubst %,$(writerfilter_WORK)/OOXMLFactory_%.cxx,$(writerfilter_OOXMLNAMESPACES)) \