move bundled binary OXT to new module external/misc_extensions

... and use ExtensionPackageSet to copy them to INSTDIR.

Change-Id: I3c77e986c308ffbabb5e55b93d3e04e6282bf4c9

9 files changed, 125 insertions, 202 deletions

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
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index b8429d80ff1a..c94b1e0195f0 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -59,12 +59,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 ))
 endif
 
-ifeq ($(WITH_EXTRA_EXTENSIONS),YES)
-$(eval $(call gb_Module_add_targets,extras,\
-	Package_extensions \
-))
-endif
-
 ifeq ($(WITH_EXTRA_FONT),YES)
 $(eval $(call gb_Module_add_targets,extras,\
 	ExternalPackage_extra_fonts \
diff --git a/extras/Package_extensions.mk b/extras/Package_extensions.mk
deleted file mode 100644
index a88679eee2db..000000000000
--- a/extras/Package_extensions.mk
+++ /dev/null
@@ -1,59 +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/.
-#
-
-# Technically these files do not belong to extras module, but they must
-# be delivered from somewhere, so why not from extras...
-$(eval $(call gb_Package_Package,extras_extensions,$(TARFILE_LOCATION)))
-
-$(eval $(call gb_Package_set_outdir,extras_extensions,$(OUTDIR)))
-
-ifneq ($(BARCODE_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Barcode.oxt,$(BARCODE_EXTENSION_PACK)))
-endif
-ifneq ($(DIAGRAM_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/SmART.oxt,$(DIAGRAM_EXTENSION_PACK)))
-endif
-ifneq ($(GOOGLE_DOCS_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/gdocs.oxt,$(GOOGLE_DOCS_EXTENSION_PACK)))
-endif
-ifneq ($(HUNART_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/hunart.oxt,$(HUNART_EXTENSION_PACK)))
-endif
-ifneq ($(NUMBERTEXT_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/numbertext.oxt,$(NUMBERTEXT_EXTENSION_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_DE_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-de.oxt,$(SUNTEMPLATES_DE_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_EN_US_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-en-US.oxt,$(SUNTEMPLATES_EN_US_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_ES_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-es.oxt,$(SUNTEMPLATES_ES_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_FR_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-fr.oxt,$(SUNTEMPLATES_FR_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_HU_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-hu.oxt,$(SUNTEMPLATES_HU_PACK)))
-endif
-ifneq ($(SUNTEMPLATES_IT_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Sun-ODF-Template-Pack-it.oxt,$(SUNTEMPLATES_IT_PACK)))
-endif
-ifneq ($(TYPO_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/typo.oxt,$(TYPO_EXTENSION_PACK)))
-endif
-ifneq ($(VALIDATOR_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/Validator.oxt,$(VALIDATOR_EXTENSION_PACK)))
-endif
-ifneq ($(WATCH_WINDOW_EXTENSION_PACK),)
-$(eval $(call gb_Package_add_file,extras_extensions,bin/WatchWindow.oxt,$(WATCH_WINDOW_EXTENSION_PACK)))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
index 31f2e32985dd..92b0dcf9e1f6 100644
--- a/scp2/source/extensions/directory_extensions.scp
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -33,17 +33,6 @@ End
 
 #endif
 
-/* ** Numbertext ** */
-
-#ifdef WITH_EXTENSION_NUMBERTEXT
-
-Directory gid_Brand_Dir_Share_Extensions_NumberText
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "numbertext";
-End
-
-#endif
-
 /* ** ConvertTextToNumber ** */
 
 #ifdef WITH_EXTENSION_CT2N
@@ -55,83 +44,6 @@ End
 
 #endif
 
-/* ** Hungarian Cross-reference Toolbar** */
-
-#ifdef WITH_EXTENSION_HUNART
-
-Directory gid_Brand_Dir_Share_Extensions_HunArt
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "hunart";
-End
-
-#endif
-
-/* ** Typography Toolbar** */
-
-#ifdef WITH_EXTENSION_TYPO
-
-Directory gid_Brand_Dir_Share_Extensions_Typo
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "typo";
-End
-
-#endif
-
-/* ** Watch Window ** */
-
-#ifdef WITH_EXTENSION_WATCH_WINDOW
-
-Directory gid_Brand_Dir_Share_Extensions_Watch_Window
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "WatchWindow";
-End
-
-#endif
-
-/* ** Diagram ** */
-
-#ifdef WITH_EXTENSION_DIAGRAM
-
-Directory gid_Brand_Dir_Share_Extensions_Diagram
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Diagram";
-End
-
-#endif
-
-/* ** Validator ** */
-
-#ifdef WITH_EXTENSION_VALIDATOR
-
-Directory gid_Brand_Dir_Share_Extensions_Validator
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Validator";
-End
-
-#endif
-
-/* ** Barcode ** */
-
-#ifdef WITH_EXTENSION_BARCODE
-
-Directory gid_Brand_Dir_Share_Extensions_Barcode
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "Barcode";
-End
-
-#endif
-
-/* ** Google Docs ** */
-
-#ifdef WITH_EXTENSION_GOOGLE_DOCS
-
-Directory gid_Brand_Dir_Share_Extensions_Google_Docs
-	ParentID = gid_Brand_Dir_Share_Extensions;
-	DosName = "gdocs";
-End
-
-#endif
-
 /* ** NLPSolver ** */
 
 #ifdef WITH_EXTENSION_NLPSOLVER
@@ -154,21 +66,4 @@ End
 
 #endif
 
-/* ** Sun Template Pack ** */
-
-#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
-
-Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
-    DosName (de) = "Sun_ODF_Template_Pack_de";
-    DosName (es) = "Sun_ODF_Template_Pack_es";
-    DosName (fr) = "Sun_ODF_Template_Pack_fr";
-    DosName (hu) = "Sun_ODF_Template_Pack_hu";
-    DosName (it) = "Sun_ODF_Template_Pack_it";
-    DosName = "Sun_ODF_Template_Pack";
-End
-
-#endif
-
 #endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index f76f25fe241e..09966f796aa9 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -41,9 +41,9 @@ End
 
 File gid_File_Oxt_NumberText
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_NumberText;
-    Name = "numbertext.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "numbertext.filelist";
 End
 
 #endif
@@ -67,9 +67,9 @@ End
 
 File gid_File_Oxt_HunArt
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_HunArt;
-    Name = "hunart.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "hunart.filelist";
 End
 
 #endif
@@ -80,9 +80,9 @@ End
 
 File gid_File_Oxt_Typo
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Typo;
-    Name = "typo.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "typo.filelist";
 End
 
 #endif
@@ -93,9 +93,9 @@ End
 
 File gid_File_Oxt_Watch_Window
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
-    Name = "WatchWindow.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "WatchWindow.filelist";
 End
 
 #endif
@@ -106,9 +106,9 @@ End
 
 File gid_File_Oxt_Diagram
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
-    Name = "SmART.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "SmART.filelist";
 End
 
 #endif
@@ -119,9 +119,9 @@ End
 
 File gid_File_Oxt_Validator
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Validator;
-    Name = "Validator.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Validator.filelist";
 End
 
 #endif
@@ -132,9 +132,9 @@ End
 
 File gid_File_Oxt_Barcode
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Barcode;
-    Name = "Barcode.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Barcode.filelist";
 End
 
 #endif
@@ -145,9 +145,9 @@ End
 
 File gid_File_Oxt_Google_Docs
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
-    Name = "gdocs.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "gdocs.filelist";
 End
 
 #endif
@@ -197,14 +197,14 @@ End
 
 File gid_File_Optional_Extensions_Sun_Template_Pack
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
-    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
-    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
-    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
-    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
-    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
-    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name (en-US) = "Sun_ODF_Template_Pack_en-US.filelist";
+    Name (de) = "Sun_ODF_Template_Pack_de.filelist";
+    Name (it) = "Sun_ODF_Template_Pack_it.filelist";
+    Name (fr) = "Sun_ODF_Template_Pack_fr.filelist";
+    Name (es) = "Sun_ODF_Template_Pack_es.filelist";
+    Name (hu) = "Sun_ODF_Template_Pack_hu.filelist";
 End
 
 #endif