Changeset 261628 in webkit

Timestamp:

May 13, 2020 11:14:16 AM (4 years ago)

Author:

Peng Liu

Message:

Add the feature flags plist file back
​https://bugs.webkit.org/show_bug.cgi?id=211816

Reviewed by Jer Noble.

Add the WebKit.plist file to the WebKit project and use it instead of the one from the WebKitAdditions.

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

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• FeatureFlags (added)
• FeatureFlags/WebKit.plist (added)
• WebKit.xcodeproj/project.pbxproj (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-05-13  Peng Liu  <peng.liu6@apple.com>
+
+        Add the feature flags plist file back
+        https://bugs.webkit.org/show_bug.cgi?id=211816
+
+        Reviewed by Jer Noble.
+
+        Add the WebKit.plist file to the WebKit project and use it instead of the one from the WebKitAdditions.
+
+        * FeatureFlags/WebKit.plist: Added.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2020-05-13  Youenn Fablet  <youenn@apple.com>
 

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

@@ -2759 +2759 @@
                 1DE0D095211CC21300439B5F /* WKShareSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKShareSheet.h; sourceTree = "<group>"; };
                 1DE2DFAC23A959F8003E013A /* RemoteMediaResourceIdentifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RemoteMediaResourceIdentifier.h; sourceTree = "<group>"; };
+                1DEC97AC246B691E007C83F4 /* WebKit.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = WebKit.plist; sourceTree = "<group>"; };
                 1DFDD0DF23F60E1E00E9B490 /* VideoLayerRemoteCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VideoLayerRemoteCocoa.mm; sourceTree = "<group>"; };
                 1DFDD0E023F60E1F00E9B490 /* VideoLayerRemoteCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoLayerRemoteCocoa.h; sourceTree = "<group>"; };
@@ -5653 +5654 @@
                                 2D9FB1FF2375209D0049F936 /* GPUProcess */,
                                 C0CE729D1247E71D00BC0EC4 /* Derived Sources */,
+                                1DEC97AB246B6865007C83F4 /* FeatureFlags */,
                                 089C1665FE841158C02AAC07 /* Resources */,
                                 C0CE73351247F70E00BC0EC4 /* Scripts */,
@@ -6500 +6502 @@
                         );
                         path = cocoa;
+                        sourceTree = "<group>";
+                };
+                1DEC97AB246B6865007C83F4 /* FeatureFlags */ = {
+                        isa = PBXGroup;
+                        children = (
+                                1DEC97AC246B691E007C83F4 /* WebKit.plist */,
+                        );
+                        path = FeatureFlags;
                         sourceTree = "<group>";
                 };
@@ -12229 +12239 @@
                         );
                         inputPaths = (
-                                "${WK_WEBKITADDITIONS_HEADERS_FOLDER_PATH}/WebKit/WebKit.plist",
+                                "${SRCROOT}/FeatureFlags/WebKit.plist",
                         );
                         name = "Copy Feature Flags Plist";
@@ -12239 +12249 @@
                         runOnlyForDeploymentPostprocessing = 1;
                         shellPath = /bin/sh;
-                        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";
+                        shellScript = "if [[ ${WK_PLATFORM_NAME} == \"maccatalyst\" ]]; then\n    exit 0;\nfi\n\nSOURCE_DIR=\"${SRCROOT}/FeatureFlags\"\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 */ = {