Title: [288321] branches/safari-613-branch/Source/WebKit
- Revision
- 288321
- Author
- repst...@apple.com
- Date
- 2022-01-20 13:26:46 -0800 (Thu, 20 Jan 2022)
Log Message
Cherry-pick r288293. rdar://problem/87777915
Prevent empty folders being created during install builds
rdar://87777915
Patch by Elliott Williams <e...@apple.com> on 2022-01-20
Reviewed by Brady Eidson.
The "Copy Daemon Plists" script phase has output files which aren't always written to. Since
Xcode mkdir-p's these output directories, it ends up creating an empty directory under some
circumstances. Fix by removing these declared outputs: since this script is install-only
and executes quickly, it's not really a problem to have it run redundantly.
Once we use XCBuild everywhere, it can be rewritten as a Copy Files phase.
* WebKit.xcodeproj/project.pbxproj:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613-branch/Source/WebKit/ChangeLog (288320 => 288321)
--- branches/safari-613-branch/Source/WebKit/ChangeLog 2022-01-20 21:26:43 UTC (rev 288320)
+++ branches/safari-613-branch/Source/WebKit/ChangeLog 2022-01-20 21:26:46 UTC (rev 288321)
@@ -1,5 +1,42 @@
2022-01-20 Russell Epstein <repst...@apple.com>
+ Cherry-pick r288293. rdar://problem/87777915
+
+ Prevent empty folders being created during install builds
+ rdar://87777915
+
+ Patch by Elliott Williams <e...@apple.com> on 2022-01-20
+ Reviewed by Brady Eidson.
+
+ The "Copy Daemon Plists" script phase has output files which aren't always written to. Since
+ Xcode mkdir-p's these output directories, it ends up creating an empty directory under some
+ circumstances. Fix by removing these declared outputs: since this script is install-only
+ and executes quickly, it's not really a problem to have it run redundantly.
+
+ Once we use XCBuild everywhere, it can be rewritten as a Copy Files phase.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@288293 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2022-01-20 Elliott Williams <e...@apple.com>
+
+ Prevent empty folders being created during install builds
+ rdar://87777915
+
+ Reviewed by Brady Eidson.
+
+ The "Copy Daemon Plists" script phase has output files which aren't always written to. Since
+ Xcode mkdir-p's these output directories, it ends up creating an empty directory under some
+ circumstances. Fix by removing these declared outputs: since this script is install-only
+ and executes quickly, it's not really a problem to have it run redundantly.
+
+ Once we use XCBuild everywhere, it can be rewritten as a Copy Files phase.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
+2022-01-20 Russell Epstein <repst...@apple.com>
+
Cherry-pick r287997. rdar://problem/87274541
Sometimes cannot scroll after using internal trackpad
Modified: branches/safari-613-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj (288320 => 288321)
--- branches/safari-613-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-20 21:26:43 UTC (rev 288320)
+++ branches/safari-613-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-01-20 21:26:46 UTC (rev 288321)
@@ -15084,11 +15084,10 @@
outputFileListPaths = (
);
outputPaths = (
- "$(DSTROOT)/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist",
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n ADATTRIBUTIOND_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n ADATTRIBUTIOND_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n echo plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n";
+ shellScript = "if [[ \"${WK_PLATFORM_NAME}\" == iphoneos ]]; then\n ADATTRIBUTIOND_PLIST_SOURCE=\"${SRCROOT}/Shared/EntryPointUtilities/Cocoa/Daemon/com.apple.webkit.adattributiond.plist\"\n ADATTRIBUTIOND_PLIST_DESTINATION=\"${DSTROOT}/System/Library/LaunchDaemons/com.apple.webkit.adattributiond.plist\"\n echo \"copying adattributiond plist\"\n mkdir -p \"$(dirname \"${ADATTRIBUTIOND_PLIST_DESTINATION}\")\"\n echo plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\n plutil -convert binary1 -o \"${ADATTRIBUTIOND_PLIST_DESTINATION}\" \"${ADATTRIBUTIOND_PLIST_SOURCE}\"\nelse\n echo \"not copying adattributiond plist\"\nfi\n";
};
E1AC2E2C20F7B95800B0897D /* Unlock Keychain */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
