install SpotlightImporter bundle using filelists

Change-Id: I01ea506b76356ce62688350d096ff77c2cddcbdf

extensions/Module_extensions.mk

@@ -120,7 +120,8 @@ endif # ENABLE_NPAPI_INTO_BROWSER=YES
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_OOoSpotlightImporter \
-	Zip_mdibundle \
+	Package_mdibundle \
+	Package_OOoSpotlightImporter \
 ))
 endif # OS=MACOSX
 

extensions/Package_OOoSpotlightImporter.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_Package_Package,extensions_OOoSpotlightImporter,$(OUTDIR)/lib))
+
+$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extensions_OOoSpotlightImporter,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter,$(call gb_Library_get_runtime_filename,OOoSpotlightImporter)))
+
+# vim: set noet sw=4 ts=4:

extensions/Package_mdibundle.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_Package_Package,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter))
+
+$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
+    Info.plist \
+    en.lproj/schema.strings \
+    schema.xml \
+))
+
+# vim: set noet sw=4 ts=4:

extensions/Zip_mdibundle.mk

-# -*- Mode: makefile; 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_Zip_Zip,mdibundle,$(WORKDIR)/Zip/mdibundle))
-
-$(eval $(call gb_Zip_add_file,mdibundle,schema.xml,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/schema.xml))
-$(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/Info.plist))
-$(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
-$(eval $(call gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
-
-# vim:set noet sw=4 ts=4:

scp2/source/ooo/file_ooo.scp

@@ -1258,10 +1258,17 @@ End
 
 #ifdef MACOSX
 File gid_File_Spotlight_Bundle
-    ARCHIVE_TXT_FILE_BODY;
-    Dir = gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents;
-    Name = "mdibundle.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    TXT_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "extensions_mdibundle.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Spotlight_Bundle_lib
+    TXT_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "extensions_OOoSpotlightImporter.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 #endif