diff --git a/Makefile.in b/Makefile.in index 17f84342a997..b049de46620e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -236,7 +236,9 @@ distclean : clean compilerplugins-clean mac-app-store-package.clean $(BUILDDIR)/solenv/lockfile/autoconf.h \ $(BUILDDIR)/lo.xcent \ $(BUILDDIR)/sysui/desktop/macosx/Info.plist \ - $(BUILDDIR)/vs-code*.code-workspace* + $(BUILDDIR)/vs-code*.code-workspace* \ + $(BUILDDIR)/extensions/source/macosx/quicklookpreview/appex/Info.plist \ + $(BUILDDIR)/extensions/source/macosx/quicklookthumbnail/appex/Info.plist $(if $(filter WNT,$(OS)),env -i PATH="$$PATH") $(FIND) $(SRCDIR)/solenv/gdb -name \*.pyc -exec rm -f {} \; # diff --git a/configure.ac b/configure.ac index 41cc74e1648c..f5f04c8eff42 100644 --- a/configure.ac +++ b/configure.ac @@ -6051,6 +6051,8 @@ if test "$cross_compiling" = "yes"; then sysui/desktop/macosx/lo.xcent.in \ .vscode/vs-code-template.code-workspace.in \ solenv/lockfile/autoconf.h.in \ + extensions/source/macosx/quicklookpreview/appex/Info.plist.in \ + extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in \ ) \ | (cd CONF-FOR-BUILD && tar xf -) cp configure CONF-FOR-BUILD @@ -15852,6 +15854,8 @@ AC_CONFIG_FILES([ sysui/desktop/macosx/Info.plist hardened_runtime.xcent:sysui/desktop/macosx/hardened_runtime.xcent.in lo.xcent:sysui/desktop/macosx/lo.xcent.in + extensions/source/macosx/quicklookpreview/appex/Info.plist + extensions/source/macosx/quicklookthumbnail/appex/Info.plist ]) # map unix-style mount dirs to windows directories: /mnt/c/foobar -> C:/foobar # easier to do it in a postprocessing command than to modify every single variable diff --git a/extensions/Package_quicklookpreviewappex.mk b/extensions/Package_quicklookpreviewappex.mk index c90db2546833..85bc0b2560e3 100644 --- a/extensions/Package_quicklookpreviewappex.mk +++ b/extensions/Package_quicklookpreviewappex.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,extensions_quicklookpreviewappex,$(SRCDIR)/extensions/source/macosx/quicklookpreview/appex)) +$(eval $(call gb_Package_Package,extensions_quicklookpreviewappex,$(BUILDDIR)/extensions/source/macosx/quicklookpreview/appex)) $(eval $(call gb_Package_add_files,extensions_quicklookpreviewappex,PlugIns/QuickLookPreview.appex/Contents,\ Info.plist \ diff --git a/extensions/Package_quicklookthumbnailappex.mk b/extensions/Package_quicklookthumbnailappex.mk index 32628d50452d..715270df7d49 100644 --- a/extensions/Package_quicklookthumbnailappex.mk +++ b/extensions/Package_quicklookthumbnailappex.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,extensions_quicklookthumbnailappex,$(SRCDIR)/extensions/source/macosx/quicklookthumbnail/appex)) +$(eval $(call gb_Package_Package,extensions_quicklookthumbnailappex,$(BUILDDIR)/extensions/source/macosx/quicklookthumbnail/appex)) $(eval $(call gb_Package_add_files,extensions_quicklookthumbnailappex,PlugIns/QuickLookThumbnail.appex/Contents,\ Info.plist \ diff --git a/extensions/source/macosx/quicklookpreview/appex/.gitignore b/extensions/source/macosx/quicklookpreview/appex/.gitignore new file mode 100644 index 000000000000..f690390fcd6a --- /dev/null +++ b/extensions/source/macosx/quicklookpreview/appex/.gitignore @@ -0,0 +1,9 @@ +# +# 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/. +# + +/Info.plist diff --git a/extensions/source/macosx/quicklookpreview/appex/Info.plist b/extensions/source/macosx/quicklookpreview/appex/Info.plist.in similarity index 88% rename from extensions/source/macosx/quicklookpreview/appex/Info.plist rename to extensions/source/macosx/quicklookpreview/appex/Info.plist.in index e17296d9de07..2010e8a1bca2 100644 --- a/extensions/source/macosx/quicklookpreview/appex/Info.plist +++ b/extensions/source/macosx/quicklookpreview/appex/Info.plist.in @@ -12,15 +12,15 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - LibreOffice Quick Look Preview + @PRODUCTNAME@ Quick Look Preview CFBundleExecutable QuickLookPreview CFBundleIdentifier - org.libreoffice.quicklookpreview + @MACOSX_BUNDLE_IDENTIFIER@.quicklookpreview CFBundleInfoDictionaryVersion 6.0 CFBundleName - QuickLookPreview + @PRODUCTNAME_WITHOUT_SPACES@QuickLookPreview CFBundlePackageType XPC! CFBundleShortVersionString @@ -32,7 +32,11 @@ CFBundleVersion 1 LSMinimumSystemVersion - 12.0 + @MACOSX_DEPLOYMENT_TARGET@.0 + DTXcodeBuild + @MACOSX_XCODE_BUILD_VERSION@ + DTSDKBuild + @MACOSX_SDK_BUILD_VERSION@ NSExtension NSExtensionAttributes diff --git a/extensions/source/macosx/quicklookthumbnail/appex/.gitignore b/extensions/source/macosx/quicklookthumbnail/appex/.gitignore new file mode 100644 index 000000000000..f690390fcd6a --- /dev/null +++ b/extensions/source/macosx/quicklookthumbnail/appex/.gitignore @@ -0,0 +1,9 @@ +# +# 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/. +# + +/Info.plist diff --git a/extensions/source/macosx/quicklookthumbnail/appex/Info.plist b/extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in similarity index 88% rename from extensions/source/macosx/quicklookthumbnail/appex/Info.plist rename to extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in index d8a1d1338371..7ae631f1dc59 100644 --- a/extensions/source/macosx/quicklookthumbnail/appex/Info.plist +++ b/extensions/source/macosx/quicklookthumbnail/appex/Info.plist.in @@ -12,15 +12,15 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - LibreOffice Quick Look Thumbnail + @PRODUCTNAME@ Quick Look Thumbnail CFBundleExecutable QuickLookThumbnail CFBundleIdentifier - org.libreoffice.quicklookthumbnail + @MACOSX_BUNDLE_IDENTIFIER@.quicklookthumbnail CFBundleInfoDictionaryVersion 6.0 CFBundleName - QuickLookThumbnail + @PRODUCTNAME_WITHOUT_SPACES@QuickLookThumbnail CFBundlePackageType XPC! CFBundleShortVersionString @@ -32,7 +32,11 @@ CFBundleVersion 1 LSMinimumSystemVersion - 10.15 + @MACOSX_DEPLOYMENT_TARGET@.0 + DTXcodeBuild + @MACOSX_XCODE_BUILD_VERSION@ + DTSDKBuild + @MACOSX_SDK_BUILD_VERSION@ NSExtension NSExtensionAttributes