From 27d0ddf6b4526ffdf2e166e20a03a4c40a0f9936 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Fri, 18 Oct 2013 22:22:34 +0200 Subject: fdo#70393: move libwps to a subdir of external Change-Id: Ib7c85b6004f4cf1cc3a3ecf280d9c99fb2e7297f Reviewed-on: https://gerrit.libreoffice.org/6338 Reviewed-by: David Tardon Tested-by: David Tardon --- RepositoryModule_host.mk | 1 - external/Module_external.mk | 1 + external/libwps/ExternalProject_libwps.mk | 40 +++++++++++++++++++++++++++++++ external/libwps/Makefile | 7 ++++++ external/libwps/Module_libwps.mk | 17 +++++++++++++ external/libwps/README | 1 + external/libwps/UnpackedTarball_libwps.mk | 14 +++++++++++ libwps/ExternalProject_libwps.mk | 40 ------------------------------- libwps/Makefile | 7 ------ libwps/Module_libwps.mk | 21 ---------------- libwps/README | 1 - libwps/UnpackedTarball_libwps.mk | 14 ----------- 12 files changed, 80 insertions(+), 84 deletions(-) create mode 100644 external/libwps/ExternalProject_libwps.mk create mode 100644 external/libwps/Makefile create mode 100644 external/libwps/Module_libwps.mk create mode 100644 external/libwps/README create mode 100644 external/libwps/UnpackedTarball_libwps.mk delete mode 100644 libwps/ExternalProject_libwps.mk delete mode 100644 libwps/Makefile delete mode 100644 libwps/Module_libwps.mk delete mode 100644 libwps/README delete mode 100644 libwps/UnpackedTarball_libwps.mk diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f89f6b391620..cc3d4d66fcda 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ librelogo \ - $(call gb_Helper_optional,WPS,libwps) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ libxmlsec \ $(call gb_Helper_optional,LIBXSLT,libxslt) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 840081a598e8..a583184d8d56 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ $(call gb_Helper_optional,WPG,libwpg) \ + $(call gb_Helper_optional,WPS,libwps) \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk new file mode 100644 index 000000000000..5af9deda7052 --- /dev/null +++ b/external/libwps/ExternalProject_libwps.mk @@ -0,0 +1,40 @@ +# -*- 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,libwps)) + +$(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) + +$(eval $(call gb_ExternalProject_register_targets,libwps,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libwps,\ + boost_headers \ + wpd \ +)) + +$(call gb_ExternalProject_get_state_target,libwps,build) : + $(call gb_ExternalProject_run,build,\ + export PKG_CONFIG="" \ + && ./configure \ + --with-pic \ + --enable-static \ + --disable-shared \ + --without-docs \ + --disable-debug \ + --disable-werror \ + CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ + $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ + ) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/Makefile b/external/libwps/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/libwps/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/external/libwps/Module_libwps.mk b/external/libwps/Module_libwps.mk new file mode 100644 index 000000000000..a6870faa9a08 --- /dev/null +++ b/external/libwps/Module_libwps.mk @@ -0,0 +1,17 @@ +# -*- 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,libwps)) + +$(eval $(call gb_Module_add_targets,libwps,\ + ExternalProject_libwps \ + UnpackedTarball_libwps \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libwps/README b/external/libwps/README new file mode 100644 index 000000000000..3ce52187d520 --- /dev/null +++ b/external/libwps/README @@ -0,0 +1 @@ +Microsoft Works file word processor format import library from [http://libwps.sourceforge.net/]. diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk new file mode 100644 index 000000000000..1fd633acbe90 --- /dev/null +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -0,0 +1,14 @@ +# -*- 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,libwps)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk deleted file mode 100644 index 5af9deda7052..000000000000 --- a/libwps/ExternalProject_libwps.mk +++ /dev/null @@ -1,40 +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_ExternalProject_ExternalProject,libwps)) - -$(eval $(call gb_ExternalProject_use_autoconf,libwps,build)) - -$(eval $(call gb_ExternalProject_register_targets,libwps,\ - build \ -)) - -$(eval $(call gb_ExternalProject_use_externals,libwps,\ - boost_headers \ - wpd \ -)) - -$(call gb_ExternalProject_get_state_target,libwps,build) : - $(call gb_ExternalProject_run,build,\ - export PKG_CONFIG="" \ - && ./configure \ - --with-pic \ - --enable-static \ - --disable-shared \ - --without-docs \ - --disable-debug \ - --disable-werror \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && (cd $(EXTERNAL_WORKDIR)/src/lib && \ - $(if $(VERBOSE)$(verbose),V=1) \ - $(MAKE)) \ - ) - -# vim: set noet sw=4 ts=4: diff --git a/libwps/Makefile b/libwps/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/libwps/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- 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/libwps/Module_libwps.mk b/libwps/Module_libwps.mk deleted file mode 100644 index ee163f09060b..000000000000 --- a/libwps/Module_libwps.mk +++ /dev/null @@ -1,21 +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_Module_Module,libwps)) - -ifeq ($(SYSTEM_WPS),NO) - -$(eval $(call gb_Module_add_targets,libwps,\ - ExternalProject_libwps \ - UnpackedTarball_libwps \ -)) - -endif - -# vim: set noet sw=4 ts=4: diff --git a/libwps/README b/libwps/README deleted file mode 100644 index 3ce52187d520..000000000000 --- a/libwps/README +++ /dev/null @@ -1 +0,0 @@ -Microsoft Works file word processor format import library from [http://libwps.sourceforge.net/]. diff --git a/libwps/UnpackedTarball_libwps.mk b/libwps/UnpackedTarball_libwps.mk deleted file mode 100644 index 1fd633acbe90..000000000000 --- a/libwps/UnpackedTarball_libwps.mk +++ /dev/null @@ -1,14 +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_UnpackedTarball_UnpackedTarball,libwps)) - -$(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL))) - -# vim: set noet sw=4 ts=4: -- cgit