convert libxslt to gbuild and add to tail_build

Change-Id: I16eb442fd65b3a2f3a44108f670fd364dc7a64c0
Reviewed-on: https://gerrit.libreoffice.org/1988Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>

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 \

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
 

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 \

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@

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])

libxslt/ExternalPackage_xslt.mk

+# -*- 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:

libxslt/ExternalProject_xslt.mk

+# -*- 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:

libxslt/Makefile

+# -*- 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:

libxslt/Module_libxslt.mk

+# -*- 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:

libxslt/UnpackedTarball_xslt.mk

+# -*- 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:

libxslt/dummy/bin/xml2-config

-#!/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

libxslt/libxslt-vc10.patch

---- 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

libxslt/libxsltversion.mk

-#*************************************************************************
-#
-# 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
-

libxslt/makefile.mk

-#*************************************************************************
-#
-# 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
-

libxslt/prj/build.lst

 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

libxslt/prj/d.lst

-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

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) \
 ))

tail_build/prj/build.lst

-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

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)) \