Ensure xcodebuild uses the Info.plist file verbatim

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>

diff --git a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Info.plist b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Info.plist
index d418f5a579b7bf5acdebc3d89eabc87cd99f76e5..e5ab2fbecbd5e1f0593ec96fe5cc94b6ec99e81b 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Info.plist
+++ b/shell_integration/MacOSX/NextcloudIntegration/FileProviderExt/Info.plist
@@ -7,7 +7,7 @@
        <key>CFBundleDisplayName</key>
        <string>$(OC_APPLICATION_NAME) File Provider Extension</string>
        <key>CFBundleIdentifier</key>
-       <string>$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME:rfc1034identifier)</string>
+       <string>$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME)</string>
        <key>NSExtension</key>
        <dict>
                <key>NSExtensionFileProviderDocumentGroup</key>

diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
index a7d66cd2524a2d68771d7b57dbff04feeb1b4cbc..b3ee9b3944177ae3b1d6e1c0d513edbbb9225a8c 100644 (file)
--- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj
@@ -667,19 +667,16 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FileProviderExt/Info.plist;
-                               INFOPLIST_KEY_CFBundleDisplayName = FileProviderExt;
-                               INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 11.0;
-                               MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
                                MTL_FAST_MATH = YES;
                                ONLY_ACTIVE_ARCH = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.owncloud.desktopclient.FileProviderExt;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SDKROOT = macosx;
@@ -720,18 +717,15 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FileProviderExt/Info.plist;
-                               INFOPLIST_KEY_CFBundleDisplayName = FileProviderExt;
-                               INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
                                        "@executable_path/../Frameworks",
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 11.0;
-                               MARKETING_VERSION = 1.0;
                                MTL_ENABLE_DEBUG_INFO = NO;
                                MTL_FAST_MATH = YES;
-                               PRODUCT_BUNDLE_IDENTIFIER = com.owncloud.desktopclient.FileProviderExt;
+                               PRODUCT_BUNDLE_IDENTIFIER = "$(OC_APPLICATION_REV_DOMAIN).$(PRODUCT_NAME)";
                                PRODUCT_NAME = "$(TARGET_NAME)";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SDKROOT = macosx;
@@ -778,7 +772,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
-                               INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                IPHONEOS_DEPLOYMENT_TARGET = 16.2;
                                LD_RUNPATH_SEARCH_PATHS = (
@@ -841,7 +834,6 @@
                                GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GENERATE_INFOPLIST_FILE = YES;
-                               INFOPLIST_KEY_NSHumanReadableCopyright = "";
                                INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                IPHONEOS_DEPLOYMENT_TARGET = 16.2;
                                LD_RUNPATH_SEARCH_PATHS = (
@@ -1083,6 +1075,7 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_UNUSED_FUNCTION = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FinderSyncExt/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",
@@ -1137,6 +1130,7 @@
                                GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
                                GCC_WARN_UNUSED_FUNCTION = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               GENERATE_INFOPLIST_FILE = YES;
                                INFOPLIST_FILE = FinderSyncExt/Info.plist;
                                LD_RUNPATH_SEARCH_PATHS = (
                                        "$(inherited)",