Title: [184836] branches/safari-601.1.32.2-branch/Source/WebKit2
- Revision
- 184836
- Author
- [email protected]
- Date
- 2015-05-23 20:14:09 -0700 (Sat, 23 May 2015)
Log Message
Merged r184834. rdar://problem/21090327
Modified Paths
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184835 => 184836)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-24 03:08:26 UTC (rev 184835)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-24 03:14:09 UTC (rev 184836)
@@ -1,3 +1,17 @@
+2015-05-23 Babak Shafiei <[email protected]>
+
+ Merge r184834.
+
+ 2015-05-23 Dan Bernstein <[email protected]>
+
+ <rdar://problem/21090327> /S/L/PrivateFrameworks/WebKit.framework is missing Headers and PrivateHeaders symlinks
+ https://bugs.webkit.org/show_bug.cgi?id=145354
+
+ Reviewed by David Kilzer.
+
+ * WebKit2.xcodeproj/project.pbxproj: Create Headers and PrivateHeaders symlinks alongside
+ the dylib symlink.
+
2015-05-22 Babak Shafiei <[email protected]>
Build fix after r184774.
Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184835 => 184836)
--- branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-24 03:08:26 UTC (rev 184835)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-24 03:14:09 UTC (rev 184836)
@@ -8660,7 +8660,7 @@
5DF408C6131DD49700130071 /* Check For Framework Include Consistency */,
5DF408D1131DDBEC00130071 /* Check For Inappropriate Files In Framework */,
A55DEAA61670402E003DB841 /* Check For Inappropriate Macros in External Headers */,
- 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */,
+ 1A07D2F61919AB1B00ECDA16 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */,
);
buildRules = (
);
@@ -9040,19 +9040,19 @@
shellPath = /bin/sh;
shellScript = "if [[ ${PLATFORM_NAME} != \"macosx\" ]]; then\nexit 0\nfi\n\nln -sf Versions/Current/Frameworks \"$TARGET_BUILD_DIR/WebKit.framework/Frameworks\"\n";
};
- 1A07D2F61919AB1B00ECDA16 /* Add Symlink in /System/Library/PrivateFrameworks */ = {
+ 1A07D2F61919AB1B00ECDA16 /* Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 8;
files = (
);
inputPaths = (
);
- name = "Add Symlink in /System/Library/PrivateFrameworks";
+ name = "Add Symlinks in /System/Library/PrivateFrameworks/WebKit.framework";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\"\nfi\n\n# If the symlink already exists, remove it and create the new one in its place.\nln -s -h -f ../../Frameworks/WebKit.framework/WebKit ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework/WebKit";
+ shellScript = "if [[ ${PLATFORM_NAME} != \"iphoneos\" ]]; then\n exit 0;\nfi\n\nif [[ ! -d \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\" ]]; then\n mkdir -p \"${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework\"\nfi\n\n# If the symlinks already exist, remove them and create the new ones in their place.\nln -s -h -f ../../Frameworks/WebKit.framework/WebKit ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework/WebKit\nln -s -h -f ../../Frameworks/WebKit.framework/Headers ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework/Headers\nln -s -h -f ../../Frameworks/WebKit.framework/PrivateHeaders ${INSTALL_DIR}/../PrivateFrameworks/WebKit.framework/PrivateHeaders";
};
1A1D2115191D96380001619F /* Postprocess Framework Headers */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
