[Libreoffice-commits] core.git: bin/lo-all-static-libs external/libxslt RepositoryExternal.mk
Michael Stahl
mstahl at redhat.com
Fri Sep 15 09:05:23 UTC 2017
RepositoryExternal.mk | 22 +++++++++----------
bin/lo-all-static-libs | 2 -
external/libxslt/ExternalPackage_libxslt.mk | 32 ++++++++++++++++++++++++++++
external/libxslt/ExternalPackage_xslt.mk | 32 ----------------------------
external/libxslt/ExternalProject_libxslt.mk | 12 +++++-----
external/libxslt/Module_libxslt.mk | 6 ++---
external/libxslt/UnpackedTarball_libxslt.mk | 6 ++---
external/libxslt/libxslt-config.patch.1 | 8 +++----
8 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 15b973ed64cb0c655b387c5022fc2ff0894520dd
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Sep 14 15:26:10 2017 +0200
consistent naming of externals: xslt -> libxslt
Change-Id: Ie66848187cef395d8b0af4727a4d9c0919e3c9dc
Reviewed-on: https://gerrit.libreoffice.org/42299
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4b90a1e2d979..55508304f8d1 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -877,42 +877,42 @@ endef
else # !SYSTEM_LIBXSLT
$(eval $(call gb_Helper_register_packages_for_install,ooo,\
- xslt \
+ libxslt \
))
define gb_LinkTarget__use_libxslt
-$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_use_package,$(1),libxslt)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,xslt) \
+ -I$(call gb_UnpackedTarball_get_dir,libxslt) \
)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libxslt.lib \
+ $(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libxslt.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,xslt)/libxslt/.libs -lxslt \
+ -L$(call gb_UnpackedTarball_get_dir,libxslt)/libxslt/.libs -lxslt \
)
endif
endef
define gb_LinkTarget__use_libexslt
-$(call gb_LinkTarget_use_package,$(1),xslt)
+$(call gb_LinkTarget_use_package,$(1),libxslt)
$(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
- -I$(call gb_UnpackedTarball_get_dir,xslt) \
+ -I$(call gb_UnpackedTarball_get_dir,libxslt) \
)
ifeq ($(COM),MSC)
$(call gb_LinkTarget_add_libs,$(1),\
- $(call gb_UnpackedTarball_get_dir,xslt)/win32/bin.msvc/libexslt.lib \
+ $(call gb_UnpackedTarball_get_dir,libxslt)/win32/bin.msvc/libexslt.lib \
)
else
$(call gb_LinkTarget_add_libs,$(1),\
- -L$(call gb_UnpackedTarball_get_dir,xslt)/libexslt/.libs -lexslt \
+ -L$(call gb_UnpackedTarball_get_dir,libxslt)/libexslt/.libs -lexslt \
)
endif
@@ -3925,11 +3925,11 @@ gb_ExternalExecutable__register_xsltproc :=
else # ! SYSTEM_LIBXSLT_FOR_BUILD
define gb_ExternalExecutable__register_xsltproc
-$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt)
+$(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),libxslt)
$(call gb_ExternalExecutable_add_dependencies,xsltproc,\
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \
$(call gb_Package_get_target,libxml2) \
- $(call gb_Package_get_target,xslt) \
+ $(call gb_Package_get_target,libxslt) \
)
endef
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 1a2f94214c48..310c432fc0a6 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -82,4 +82,4 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$WORKDIR/UnpackedTarball/rasqal/src/.libs/*.a \
$WORKDIR/UnpackedTarball/redland/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libxml2/.libs/*.a \
- $WORKDIR/UnpackedTarball/xslt/libxslt/.libs/*.a
+ $WORKDIR/UnpackedTarball/libxslt/libxslt/.libs/*.a
diff --git a/external/libxslt/ExternalPackage_libxslt.mk b/external/libxslt/ExternalPackage_libxslt.mk
new file mode 100644
index 000000000000..01c88e6f562f
--- /dev/null
+++ b/external/libxslt/ExternalPackage_libxslt.mk
@@ -0,0 +1,32 @@
+# -*- 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,libxslt,libxslt))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libxslt,libxslt))
+
+ifneq ($(DISABLE_DYNLOADING),TRUE)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
+else ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.dll,libxslt/.libs/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dll,libexslt/.libs/libexslt.dll))
+else # COM=MSC
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.dll,win32/bin.msvc/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
+endif
+else # OS!=WNT
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30))
+$(eval $(call gb_ExternalPackage_add_file,libxslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
+endif
+endif # DISABLE_DYNLOADING
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
deleted file mode 100644
index 4354bd4b6191..000000000000
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- 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 ($(DISABLE_DYNLOADING),TRUE)
-ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,libxslt/.libs/libxslt.dll))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,libexslt/.libs/libexslt.dll))
-else # COM=MSC
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,win32/bin.msvc/libxslt.dll))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
-endif
-else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.30))
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.18))
-endif
-endif # DISABLE_DYNLOADING
-
-# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_libxslt.mk
similarity index 81%
rename from external/libxslt/ExternalProject_xslt.mk
rename to external/libxslt/ExternalProject_libxslt.mk
index 0dafc9109834..9dab4766e268 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_libxslt.mk
@@ -7,15 +7,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_ExternalProject_ExternalProject,xslt))
+$(eval $(call gb_ExternalProject_ExternalProject,libxslt))
-$(eval $(call gb_ExternalProject_use_external,xslt,libxml2))
+$(eval $(call gb_ExternalProject_use_external,libxslt,libxml2))
-$(eval $(call gb_ExternalProject_register_targets,xslt,\
+$(eval $(call gb_ExternalProject_register_targets,libxslt,\
build \
))
ifeq ($(OS),WNT)
-$(call gb_ExternalProject_get_state_target,xslt,build):
+$(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
cscript /e:javascript configure.js \
$(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
&& LIB="$(ILIB)" nmake \
,win32)
else # OS!=WNT
-$(call gb_ExternalProject_get_state_target,xslt,build):
+$(call gb_ExternalProject_get_state_target,libxslt,build):
$(call gb_ExternalProject_run,build,\
./configure --without-crypto --without-python \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
@@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),\
&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
- $(gb_Package_SOURCEDIR_xslt)/libxslt/.libs/libxslt.1.dylib \
+ $(gb_Package_SOURCEDIR_libxslt)/libxslt/.libs/libxslt.1.dylib \
) \
)
endif
diff --git a/external/libxslt/Module_libxslt.mk b/external/libxslt/Module_libxslt.mk
index 6a88fe20e229..9704338920c6 100644
--- a/external/libxslt/Module_libxslt.mk
+++ b/external/libxslt/Module_libxslt.mk
@@ -10,9 +10,9 @@
$(eval $(call gb_Module_Module,libxslt))
$(eval $(call gb_Module_add_targets,libxslt,\
- ExternalPackage_xslt \
- ExternalProject_xslt \
- UnpackedTarball_xslt \
+ ExternalPackage_libxslt \
+ ExternalProject_libxslt \
+ UnpackedTarball_libxslt \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_libxslt.mk
similarity index 76%
rename from external/libxslt/UnpackedTarball_xslt.mk
rename to external/libxslt/UnpackedTarball_libxslt.mk
index da6bbe7891cc..a3ac75ca9c88 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -7,11 +7,11 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt))
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,libxslt))
-$(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
+$(eval $(call gb_UnpackedTarball_set_tarball,libxslt,$(LIBXSLT_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,xslt,\
+$(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-config.patch.1 \
external/libxslt/libxslt-internal-symbols.patch.1 \
external/libxslt/libxslt-msvc.patch.2 \
diff --git a/external/libxslt/libxslt-config.patch.1 b/external/libxslt/libxslt-config.patch.1
index dc33871398cc..7e2936357671 100644
--- a/external/libxslt/libxslt-config.patch.1
+++ b/external/libxslt/libxslt-config.patch.1
@@ -13,13 +13,13 @@ Hack the xslt-config to return paths into WORKDIR.
+#includedir=@includedir@
+#libdir=@libdir@
+
-+prefix=${WORKDIR}/UnpackedTarball/xslt
-+exec_prefix=${WORKDIR}/UnpackedTarball/xsltproc
++prefix=${WORKDIR}/UnpackedTarball/libxslt
++exec_prefix=${WORKDIR}/UnpackedTarball/libxslt
exec_prefix_set=no
-includedir=@includedir@
-libdir=@libdir@
-+includedir=${WORKDIR}/UnpackedTarball/xslt/libxslt
-+libdir=${WORKDIR}/UnpackedTarball/xslt/libxslt/.libs
++includedir=${WORKDIR}/UnpackedTarball/libxslt/libxslt
++libdir=${WORKDIR}/UnpackedTarball/libxslt/libxslt/.libs
usage()
{
More information about the Libreoffice-commits
mailing list