Title: [294114] trunk/Source/WebKit
- Revision
- 294114
- Author
- timothy_hor...@apple.com
- Date
- 2022-05-12 11:51:32 -0700 (Thu, 12 May 2022)
Log Message
Don't install WebKit feature flags plist on macOS
https://bugs.webkit.org/show_bug.cgi?id=240350
<rdar://problem/93183882>
Reviewed by Wenson Hsieh.
* WebKit.xcodeproj/project.pbxproj:
We don't need it on macOS (and won't need it at all soon), and
the script is currently installing to the wrong place for some kinds
of macOS builds. So, just skip it.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (294113 => 294114)
--- trunk/Source/WebKit/ChangeLog 2022-05-12 18:22:57 UTC (rev 294113)
+++ trunk/Source/WebKit/ChangeLog 2022-05-12 18:51:32 UTC (rev 294114)
@@ -1,3 +1,16 @@
+2022-05-12 Tim Horton <timothy_hor...@apple.com>
+
+ Don't install WebKit feature flags plist on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=240350
+ <rdar://problem/93183882>
+
+ Reviewed by Wenson Hsieh.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ We don't need it on macOS (and won't need it at all soon), and
+ the script is currently installing to the wrong place for some kinds
+ of macOS builds. So, just skip it.
+
2022-05-12 Yury Semikhatsky <yu...@chromium.org>
[GTK][WPE] Do not return pointer to disposed timezone string
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (294113 => 294114)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-12 18:22:57 UTC (rev 294113)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-05-12 18:51:32 UTC (rev 294114)
@@ -16147,7 +16147,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n exit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
+ shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac || \"${WK_PLATFORM_NAME}\" == macosx ]]; then\n exit 0\nfi\n\nFEATURE_FLAGS_PLIST_SOURCE=\"${SRCROOT}/FeatureFlags/WebKit.plist\"\nFEATURE_FLAGS_PLIST_DESTINATION=\"${DSTROOT}/System/Library/FeatureFlags/Domain/WebKit.plist\"\necho \"copying feature flags plist\"\nmkdir -p \"$(dirname \"${FEATURE_FLAGS_PLIST_DESTINATION}\")\"\necho plutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\nplutil -convert binary1 -o \"${FEATURE_FLAGS_PLIST_DESTINATION}\" \"${FEATURE_FLAGS_PLIST_SOURCE}\"\n";
};
2E16B6F42019BC25008996D6 /* Copy Additional Resources */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
