From 45460cbd4333f619fefb721462f17fc13e4f887d Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 31 Oct 2013 01:04:47 +0100 Subject: move bundled binary OXT to new module external/misc_extensions ... and use ExtensionPackageSet to copy them to INSTDIR. Change-Id: I3c77e986c308ffbabb5e55b93d3e04e6282bf4c9 --- external/Module_external.mk | 1 + .../ExtensionPackageSet_misc_extensions.mk | 68 ++++++++++++++++++++++ external/misc_extensions/Makefile | 7 +++ external/misc_extensions/Module_misc_extensions.mk | 16 +++++ external/misc_extensions/README | 1 + 5 files changed, 93 insertions(+) create mode 100644 external/misc_extensions/ExtensionPackageSet_misc_extensions.mk create mode 100644 external/misc_extensions/Makefile create mode 100644 external/misc_extensions/Module_misc_extensions.mk create mode 100644 external/misc_extensions/README (limited to 'external') diff --git a/external/Module_external.mk b/external/Module_external.mk index 24fb029f1429..09246fe73fb4 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,LPSOLVE,lpsolve) \ $(call gb_Helper_optional,MARIADB,libmariadb) \ $(call gb_Helper_optional,MDDS,mdds) \ + $(if $(filter YES,$(WITH_EXTRA_EXTENSIONS)),misc_extensions) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MOZ,moz) \ $(call gb_Helper_optional,MSPUB,libmspub) \ diff --git a/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk new file mode 100644 index 000000000000..d1c0984bc820 --- /dev/null +++ b/external/misc_extensions/ExtensionPackageSet_misc_extensions.mk @@ -0,0 +1,68 @@ +# -*- 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_ExtensionPackageSet_ExtensionPackageSet,misc_extensions)) + +ifneq ($(BARCODE_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Barcode,$(BARCODE_EXTENSION_PACK))) +endif + +ifneq ($(DIAGRAM_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,SmART,$(DIAGRAM_EXTENSION_PACK))) +endif + +ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,gdocs,$(GOOGLE_DOCS_EXTENSION_PACK))) +endif + +ifneq ($(HUNART_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,hunart,$(HUNART_EXTENSION_PACK))) +endif + +ifneq ($(NUMBERTEXT_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,numbertext,$(NUMBERTEXT_EXTENSION_PACK))) +endif + +ifneq ($(SUNTEMPLATES_DE_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_de,$(SUNTEMPLATES_DE_PACK))) +endif + +ifneq ($(SUNTEMPLATES_EN_US_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_en-US,$(SUNTEMPLATES_EN_US_PACK))) +endif + +ifneq ($(SUNTEMPLATES_ES_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_es,$(SUNTEMPLATES_ES_PACK))) +endif + +ifneq ($(SUNTEMPLATES_FR_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_fr,$(SUNTEMPLATES_FR_PACK))) +endif + +ifneq ($(SUNTEMPLATES_HU_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_hu,$(SUNTEMPLATES_HU_PACK))) +endif + +ifneq ($(SUNTEMPLATES_IT_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Sun_ODF_Template_Pack_it,$(SUNTEMPLATES_IT_PACK))) +endif + +ifneq ($(TYPO_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,typo,$(TYPO_EXTENSION_PACK))) +endif + +ifneq ($(VALIDATOR_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,Validator,$(VALIDATOR_EXTENSION_PACK))) +endif + +ifneq ($(WATCH_WINDOW_EXTENSION_PACK),) +$(eval $(call gb_ExtensionPackageSet_add_extension,misc_extensions,WatchWindow,$(WATCH_WINDOW_EXTENSION_PACK))) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/misc_extensions/Makefile b/external/misc_extensions/Makefile new file mode 100644 index 000000000000..e4968cf85fb6 --- /dev/null +++ b/external/misc_extensions/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/misc_extensions/Module_misc_extensions.mk b/external/misc_extensions/Module_misc_extensions.mk new file mode 100644 index 000000000000..86f65c2ddd59 --- /dev/null +++ b/external/misc_extensions/Module_misc_extensions.mk @@ -0,0 +1,16 @@ +# -*- 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,misc_extensions)) + +$(eval $(call gb_Module_add_targets,misc_extensions,\ + ExtensionPackageSet_misc_extensions \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/misc_extensions/README b/external/misc_extensions/README new file mode 100644 index 000000000000..9c6fa2e54936 --- /dev/null +++ b/external/misc_extensions/README @@ -0,0 +1 @@ +misc_extensions contains some extensions may be downloaded and bundled as-is -- cgit