Changeset 260842 in webkit

Timestamp:

Apr 28, 2020 12:53:42 PM (4 years ago)

Author:

ddkilzer@apple.com

Message:

[MacCatalyst] Add missing symlinks to WebKit.frameworks
<​https://webkit.org/b/211102>
<rdar://problem/62137758>

Reviewed by Brent Fulgham.

• WebKit.xcodeproj/project.pbxproj:

(Make Frameworks Symbolic Link):

• Update logic to run for macOS and macCatalyst builds.
• Add output path.

(Check For Inappropriate Objective-C Class Names):

• Let Xcode have its way with the project file by adding a newline to the end of the script.

(Check For Weak VTables and Externals): Ditto.
(Add XPCServices symlink):

• Update logic to run for macOS and macCatalyst builds.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (4 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-28  David Kilzer  <ddkilzer@apple.com>
+
+        [MacCatalyst] Add missing symlinks to WebKit.frameworks
+        <https://webkit.org/b/211102>
+        <rdar://problem/62137758>
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.xcodeproj/project.pbxproj:
+        (Make Frameworks Symbolic Link):
+        - Update logic to run for macOS and macCatalyst builds.
+        - Add output path.
+        (Check For Inappropriate Objective-C Class Names):
+        - Let Xcode have its way with the project file by adding a
+          newline to the end of the script.
+        (Check For Weak VTables and Externals): Ditto.
+        (Add XPCServices symlink):
+        - Update logic to run for macOS and macCatalyst builds.
+
 2020-04-28  Kate Cheney  <katherine_cheney@apple.com>
 

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

@@ -12127 +12127 @@
                         name = "Make Frameworks Symbolic Link";
                         outputPaths = (
+                                "$(TARGET_BUILD_DIR)/WebKit.framework/Frameworks",
                         );
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\nexit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
+                        shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == macosx || \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n    ln -sfh \"Versions/Current/Frameworks\" \"${TARGET_BUILD_DIR}/WebKit.framework/Frameworks\"\nfi\n";
                 };
                 1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
@@ -12300 +12301 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n    ../../Tools/Scripts/check-for-inappropriate-objc-class-names WK _WK || exit $?\nfi";
+                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-inappropriate-objc-class-names ]; then\n    ../../Tools/Scripts/check-for-inappropriate-objc-class-names WK _WK || exit $?\nfi\n";
                 };
                 375A248817E5048E00C9A086 /* Postprocess WKBase.h */ = {
@@ -12425 +12426 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n    ../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi";
+                        shellScript = "if [ \"${ACTION}\" = \"installhdrs\" ] || [ \"${ACTION}\" = \"installapi\" ]; then\n    exit 0;\nfi\n\nif [ -f ../../Tools/Scripts/check-for-weak-vtables-and-externals ]; then\n    ../../Tools/Scripts/check-for-weak-vtables-and-externals || exit $?\nfi\n";
                 };
                 5DF408C6131DD49700130071 /* Check For Framework Include Consistency */ = {
@@ -12571 +12572 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n    ln -sfh \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n";
+                        shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == macosx || \"${WK_PLATFORM_NAME}\" == maccatalyst || \"${WK_PLATFORM_NAME}\" == iosmac ]]; then\n    ln -sfh \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n";
                 };
                 C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {