Title: [241118] trunk/Tools
- Revision
- 241118
- Author
- [email protected]
- Date
- 2019-02-06 23:04:24 -0800 (Wed, 06 Feb 2019)
Log Message
Remove Info.plist from MobileMiniBrowser.framework's Copy Bundle Resources phase
https://bugs.webkit.org/show_bug.cgi?id=193975
<rdar://problem/47643306>
Reviewed by Tim Horton.
The MobileMiniBrowser.framework's Copy Bundle Resources phase copies
the Info.plist file into the bundle. This step is not necessary as the
implicit "bundle up all the build products into a framework" build
phase does this already. Having the Copy Bundle Resources phase do
this causes a conflict under XCBuild, which objects to two build
phases producing the same file (Info.plist). Address this by removing
Info.plist from the Copy Bundle Resources phase.
* MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (241117 => 241118)
--- trunk/Tools/ChangeLog 2019-02-07 05:51:46 UTC (rev 241117)
+++ trunk/Tools/ChangeLog 2019-02-07 07:04:24 UTC (rev 241118)
@@ -1,5 +1,23 @@
2019-02-06 Keith Rollin <[email protected]>
+ Remove Info.plist from MobileMiniBrowser.framework's Copy Bundle Resources phase
+ https://bugs.webkit.org/show_bug.cgi?id=193975
+ <rdar://problem/47643306>
+
+ Reviewed by Tim Horton.
+
+ The MobileMiniBrowser.framework's Copy Bundle Resources phase copies
+ the Info.plist file into the bundle. This step is not necessary as the
+ implicit "bundle up all the build products into a framework" build
+ phase does this already. Having the Copy Bundle Resources phase do
+ this causes a conflict under XCBuild, which objects to two build
+ phases producing the same file (Info.plist). Address this by removing
+ Info.plist from the Copy Bundle Resources phase.
+
+ * MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
+
+2019-02-06 Keith Rollin <[email protected]>
+
Really enable the automatic checking and regenerations of .xcfilelists during builds
https://bugs.webkit.org/show_bug.cgi?id=194357
<rdar://problem/47861231>
Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj (241117 => 241118)
--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj 2019-02-07 05:51:46 UTC (rev 241117)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj 2019-02-07 07:04:24 UTC (rev 241118)
@@ -24,7 +24,6 @@
CD498B501D763D7600681FA7 /* AppDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = CD1DAF981D709E3600017CF0 /* AppDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAF9E1D709E3600017CF0 /* Main.storyboard */; };
CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = CD1DAFA11D709E3600017CF0 /* Assets.xcassets */; };
- CD498B531D763D9300681FA7 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = CD498B471D7634C700681FA7 /* Info.plist */; };
CDA985191D76483400EBC399 /* test.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = CDA985151D76477900EBC399 /* test.mp4 */; };
CDA9851A1D76483400EBC399 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985131D76474100EBC399 /* index.html */; };
CDA9851B1D76483400EBC399 /* looping.html in Resources */ = {isa = PBXBuildFile; fileRef = CDA985171D7647CD00EBC399 /* looping.html */; };
@@ -345,7 +344,6 @@
files = (
CD498B521D763D8800681FA7 /* Assets.xcassets in Resources */,
CDA9851A1D76483400EBC399 /* index.html in Resources */,
- CD498B531D763D9300681FA7 /* Info.plist in Resources */,
CDA9851B1D76483400EBC399 /* looping.html in Resources */,
3F0B439B1D908D0C00D186B5 /* looping2s.html in Resources */,
CD498B511D763D7F00681FA7 /* Main.storyboard in Resources */,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
