Skip to content
This repository was archived by the owner on Jun 24, 2022. It is now read-only.

Commit b307c4d

Browse files
[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. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 9d250b4 commit b307c4d

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

Source/WebKit/ChangeLog

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
2020-04-28 David Kilzer <[email protected]>
2+
3+
[MacCatalyst] Add missing symlinks to WebKit.frameworks
4+
<https://webkit.org/b/211102>
5+
<rdar://problem/62137758>
6+
7+
Reviewed by Brent Fulgham.
8+
9+
* WebKit.xcodeproj/project.pbxproj:
10+
(Make Frameworks Symbolic Link):
11+
- Update logic to run for macOS and macCatalyst builds.
12+
- Add output path.
13+
(Check For Inappropriate Objective-C Class Names):
14+
- Let Xcode have its way with the project file by adding a
15+
newline to the end of the script.
16+
(Check For Weak VTables and Externals): Ditto.
17+
(Add XPCServices symlink):
18+
- Update logic to run for macOS and macCatalyst builds.
19+
120
2020-04-28 Kate Cheney <[email protected]>
221

322
Create a mechanism to add missing ITP Database tables when the schema is updated

Source/WebKit/WebKit.xcodeproj/project.pbxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12126,10 +12126,11 @@
1212612126
);
1212712127
name = "Make Frameworks Symbolic Link";
1212812128
outputPaths = (
12129+
"$(TARGET_BUILD_DIR)/WebKit.framework/Frameworks",
1212912130
);
1213012131
runOnlyForDeploymentPostprocessing = 0;
1213112132
shellPath = /bin/sh;
12132-
shellScript = "if [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\nexit 0\nfi\n\nln -shf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
12133+
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";
1213312134
};
1213412135
1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
1213512136
isa = PBXShellScriptBuildPhase;
@@ -12299,7 +12300,7 @@
1229912300
);
1230012301
runOnlyForDeploymentPostprocessing = 0;
1230112302
shellPath = /bin/sh;
12302-
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";
12303+
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";
1230312304
};
1230412305
375A248817E5048E00C9A086 /* Postprocess WKBase.h */ = {
1230512306
isa = PBXShellScriptBuildPhase;
@@ -12424,7 +12425,7 @@
1242412425
);
1242512426
runOnlyForDeploymentPostprocessing = 0;
1242612427
shellPath = /bin/sh;
12427-
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";
12428+
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";
1242812429
};
1242912430
5DF408C6131DD49700130071 /* Check For Framework Include Consistency */ = {
1243012431
isa = PBXShellScriptBuildPhase;
@@ -12570,7 +12571,7 @@
1257012571
);
1257112572
runOnlyForDeploymentPostprocessing = 0;
1257212573
shellPath = /bin/sh;
12573-
shellScript = "if [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n ln -sfh \"Versions/Current/XPCServices\" \"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\";\nfi\n";
12574+
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";
1257412575
};
1257512576
C0CE72841247E66800BC0EC4 /* Generate Derived Sources */ = {
1257612577
isa = PBXShellScriptBuildPhase;

0 commit comments

Comments
 (0)