Title: [255301] branches/safari-610.1.1-branch/Source/WebKitLegacy
Revision
255301
Author
[email protected]
Date
2020-01-28 13:49:50 -0800 (Tue, 28 Jan 2020)

Log Message

Cherry-pick r255094. rdar://problem/58825997

    Remove check-xcfilelists.sh from WebKitLegacy Xcode build target
    https://bugs.webkit.org/show_bug.cgi?id=206762
    <rdar://problem/58825997>

    Reviewed by Alexey Proskuryakov.

    When check-xcfilelists.sh got added to the WebKitLegacy Xcode project,
    it was also accidentally added to the WebKitLegacy build target. This
    caused it to be treated as a "resource", and so was copied to the
    output directory in the Resources sub-folder during the build. This
    copying is not expected, needed, or desired. Remove
    check-xcfilelists.sh from the target, which also removes it from the
    Copy Resources build phase, which removes it from the
    WebKitLegacy.framework/Resources directory.

    * WebKitLegacy.xcodeproj/project.pbxproj:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255094 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-610.1.1-branch/Source/WebKitLegacy/ChangeLog (255300 => 255301)


--- branches/safari-610.1.1-branch/Source/WebKitLegacy/ChangeLog	2020-01-28 21:49:48 UTC (rev 255300)
+++ branches/safari-610.1.1-branch/Source/WebKitLegacy/ChangeLog	2020-01-28 21:49:50 UTC (rev 255301)
@@ -1,3 +1,46 @@
+2020-01-28  Russell Epstein  <[email protected]>
+
+        Cherry-pick r255094. rdar://problem/58825997
+
+    Remove check-xcfilelists.sh from WebKitLegacy Xcode build target
+    https://bugs.webkit.org/show_bug.cgi?id=206762
+    <rdar://problem/58825997>
+    
+    Reviewed by Alexey Proskuryakov.
+    
+    When check-xcfilelists.sh got added to the WebKitLegacy Xcode project,
+    it was also accidentally added to the WebKitLegacy build target. This
+    caused it to be treated as a "resource", and so was copied to the
+    output directory in the Resources sub-folder during the build. This
+    copying is not expected, needed, or desired. Remove
+    check-xcfilelists.sh from the target, which also removes it from the
+    Copy Resources build phase, which removes it from the
+    WebKitLegacy.framework/Resources directory.
+    
+    * WebKitLegacy.xcodeproj/project.pbxproj:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255094 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-24  Keith Rollin  <[email protected]>
+
+            Remove check-xcfilelists.sh from WebKitLegacy Xcode build target
+            https://bugs.webkit.org/show_bug.cgi?id=206762
+            <rdar://problem/58825997>
+
+            Reviewed by Alexey Proskuryakov.
+
+            When check-xcfilelists.sh got added to the WebKitLegacy Xcode project,
+            it was also accidentally added to the WebKitLegacy build target. This
+            caused it to be treated as a "resource", and so was copied to the
+            output directory in the Resources sub-folder during the build. This
+            copying is not expected, needed, or desired. Remove
+            check-xcfilelists.sh from the target, which also removes it from the
+            Copy Resources build phase, which removes it from the
+            WebKitLegacy.framework/Resources directory.
+
+            * WebKitLegacy.xcodeproj/project.pbxproj:
+
 2020-01-07  Sihui Liu  <[email protected]>
 
         REGRESSION (r248734): different threads write m_storageMap of StorageAreaImpl at the same time

Modified: branches/safari-610.1.1-branch/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj (255300 => 255301)


--- branches/safari-610.1.1-branch/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2020-01-28 21:49:48 UTC (rev 255300)
+++ branches/safari-610.1.1-branch/Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj	2020-01-28 21:49:50 UTC (rev 255301)
@@ -160,7 +160,6 @@
 		535E08CE225463B200DF00CA /* WebKitPluginClient.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588C0EDCCEA3008D883D /* WebKitPluginClient.defs */; };
 		535E08CF225463B200DF00CA /* WebKitPluginHost.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588D0EDCCEA3008D883D /* WebKitPluginHost.defs */; };
 		535E08D0225463B200DF00CA /* WebKitPluginHostTypes.defs in Copy Mig Files into Private Framework Headers */ = {isa = PBXBuildFile; fileRef = 1AAF588E0EDCCEA3008D883D /* WebKitPluginHostTypes.defs */; };
-		537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */ = {isa = PBXBuildFile; fileRef = 537CF83B22EFC13D00C6EBB3 /* check-xcfilelists.sh */; };
 		598AD91A1201CEC900ABAE4E /* WebDeviceOrientationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD9191201CEC900ABAE4E /* WebDeviceOrientationClient.h */; };
 		598AD91E1201CECF00ABAE4E /* WebDeviceOrientationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 598AD91D1201CECF00ABAE4E /* WebDeviceOrientationClient.mm */; };
 		598AD9201201CF0700ABAE4E /* WebDeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 598AD91F1201CF0700ABAE4E /* WebDeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -3220,7 +3219,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				537CF83C22EFC13D00C6EBB3 /* check-xcfilelists.sh in Resources */,
 				29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
 				5C9D925A22D7E8AD008E9266 /* Sources.txt in Resources */,
 				5C9D925B22D7E8AD008E9266 /* SourcesCocoa.txt in Resources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to