Changeset 260599 in webkit

Timestamp:

Apr 23, 2020 2:24:38 PM (4 years ago)

Author:

Peng Liu

Message:

Remove the WebKit.plist for Feature Flags
​https://bugs.webkit.org/show_bug.cgi?id=210534

Reviewed by Simon Fraser.

• FeatureFlags/WebKit.plist: Removed.
• WebKit.xcodeproj/project.pbxproj:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• FeatureFlags (deleted)
• WebKit.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-23  Peng Liu  <peng.liu6@apple.com>
+
+        Remove the WebKit.plist for Feature Flags
+        https://bugs.webkit.org/show_bug.cgi?id=210534
+
+        Reviewed by Simon Fraser.
+
+        * FeatureFlags/WebKit.plist: Removed.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2020-04-23  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -12210 +12210 @@
                         );
                         inputPaths = (
-                                "$(SRCROOT)/FeatureFlags/WebKit.plist",
+                                "${WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH}/WebKit/WebKit.plist",
                         );
                         name = "Copy Feature Flags Plist";
@@ -12216 +12216 @@
                         );
                         outputPaths = (
-                                "$(INSTALL_ROOT)/$(SYSTEM_LIBRARY_DIR)/FeatureFlags/Domain/WebKit.plist",
+                                "${INSTALL_ROOT}/${WK_INSTALL_PATH_PREFIX}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain/WebKit.plist",
                         );
                         runOnlyForDeploymentPostprocessing = 1;
                         shellPath = /bin/sh;
-                        shellScript = "if [[ ${WK_PLATFORM_NAME} == \"maccatalyst\" ]]; then\n    exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain\" ]]; then\n    mkdir -p \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain\"\nfi\n\nditto \"${SRCROOT}/FeatureFlags/WebKit.plist\" \"${INSTALL_ROOT}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain/WebKit.plist\"\n";
+                        shellScript = "if [[ ${WK_PLATFORM_NAME} == \"maccatalyst\" ]]; then\n    exit 0;\nfi\n\nSOURCE_DIR=\"${WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH}/WebKit\"\nDEST_DIR=${INSTALL_ROOT}/${WK_INSTALL_PATH_PREFIX}/${SYSTEM_LIBRARY_DIR}/FeatureFlags/Domain\n\nif [[ ! -d \"${DEST_DIR}\" ]]; then\n    mkdir -p \"${DEST_DIR}\"\nfi\n\nditto \"${SOURCE_DIR}/WebKit.plist\" \"${DEST_DIR}/WebKit.plist\"\n";
                 };
                 2D7DEBDF21269C9F00B9F73C /* Generate Unified Sources */ = {