Title: [260842] trunk/Source/WebKit
- Revision
- 260842
- Author
- [email protected]
- Date
- 2020-04-28 12:53:42 -0700 (Tue, 28 Apr 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260841 => 260842)
--- trunk/Source/WebKit/ChangeLog 2020-04-28 19:40:49 UTC (rev 260841)
+++ trunk/Source/WebKit/ChangeLog 2020-04-28 19:53:42 UTC (rev 260842)
@@ -1,3 +1,22 @@
+2020-04-28 David Kilzer <[email protected]>
+
+ [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 <[email protected]>
Create a mechanism to add missing ITP Database tables when the schema is updated
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (260841 => 260842)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-28 19:40:49 UTC (rev 260841)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-04-28 19:53:42 UTC (rev 260842)
@@ -12126,10 +12126,11 @@
);
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 */ = {
isa = PBXShellScriptBuildPhase;
@@ -12299,7 +12300,7 @@
);
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 */ = {
isa = PBXShellScriptBuildPhase;
@@ -12424,7 +12425,7 @@
);
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 */ = {
isa = PBXShellScriptBuildPhase;
@@ -12570,7 +12571,7 @@
);
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 */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
