Title: [235439] trunk/Tools
Revision
235439
Author
ddkil...@apple.com
Date
2018-08-28 14:02:34 -0700 (Tue, 28 Aug 2018)

Log Message

Fix incorrect use of `sourceTree = "<group>";` for built products and frameworks in Xcode projects

Found by tidy-Xcode-project-file script (see Bug 188754).

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
(IOKit.framework): Use `sourceTree = "<absolute>";` to match
other frameworks in the project.
* MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
(WebKit.framework): Use `sourceTree = BUILT_PRODUCTS_DIR;` for
built product instead of relative build directory path.
* jsc-cli/jsc-cli.xcodeproj/project.pbxproj:
(_javascript_Core.framework): Ditto.
* lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj:
(libWTF.a): Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (235438 => 235439)


--- trunk/Tools/ChangeLog	2018-08-28 20:53:17 UTC (rev 235438)
+++ trunk/Tools/ChangeLog	2018-08-28 21:02:34 UTC (rev 235439)
@@ -1,3 +1,21 @@
+2018-08-28  David Kilzer  <ddkil...@apple.com>
+
+        Fix incorrect use of `sourceTree = "<group>";` for built products and frameworks in Xcode projects
+
+        Found by tidy-Xcode-project-file script (see Bug 188754).
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+        (IOKit.framework): Use `sourceTree = "<absolute>";` to match
+        other frameworks in the project.
+        * MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj:
+        (WebKit.framework): Use `sourceTree = BUILT_PRODUCTS_DIR;` for
+        built product instead of relative build directory path.
+        * jsc-cli/jsc-cli.xcodeproj/project.pbxproj:
+        (_javascript_Core.framework): Ditto.
+        * lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj:
+        (libWTF.a): Use `sourceTree = BUILT_PRODUCTS_DIR;` for built
+        product.
+
 2018-08-28  Alex Christensen  <achristen...@webkit.org>
 
         Fix 32-bit Mac build.

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (235438 => 235439)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2018-08-28 20:53:17 UTC (rev 235438)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj	2018-08-28 21:02:34 UTC (rev 235439)
@@ -263,7 +263,7 @@
 		1A4CCD4E171375A300981040 /* ToStringAndValueOfObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ToStringAndValueOfObject.cpp; sourceTree = "<group>"; };
 		1A5CC1F3137DD2EC00A5D7E7 /* GetURLWithJavaScriptURL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GetURLWithJavaScriptURL.cpp; sourceTree = "<group>"; };
 		1A66C34F14576A920099A115 /* ContentsScaleFactor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentsScaleFactor.cpp; sourceTree = "<group>"; };
-		1A7961061803454C00FE42CD /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; };
+		1A7961061803454C00FE42CD /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		1A8F024C0BB9B056008CFA34 /* TestObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestObject.h; sourceTree = "<group>"; };
 		1AC6C77F0D07589B00CD3161 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		1AC6C7800D07589B00CD3161 /* PluginObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginObject.cpp; sourceTree = "<group>"; };

Modified: trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj (235438 => 235439)


--- trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj	2018-08-28 20:53:17 UTC (rev 235438)
+++ trunk/Tools/MobileMiniBrowser/MobileMiniBrowser.xcodeproj/project.pbxproj	2018-08-28 21:02:34 UTC (rev 235439)
@@ -82,7 +82,7 @@
 		CD1DAFBB1D709EF200017CF0 /* TabViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TabViewController.m; sourceTree = "<group>"; };
 		CD1DAFBC1D709EF200017CF0 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
 		CD1DAFBD1D709EF200017CF0 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
-		CD1DAFC11D70E12D00017CF0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = "../../WebKitBuild/Debug-iphonesimulator/WebKit.framework"; sourceTree = "<group>"; };
+		CD1DAFC11D70E12D00017CF0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD498B3B1D76348000681FA7 /* MobileMiniBrowser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MobileMiniBrowser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD498B471D7634C700681FA7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CD498B481D7634C700681FA7 /* MobileMiniBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileMiniBrowser.h; sourceTree = "<group>"; };

Modified: trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj (235438 => 235439)


--- trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj	2018-08-28 20:53:17 UTC (rev 235438)
+++ trunk/Tools/jsc-cli/jsc-cli.xcodeproj/project.pbxproj	2018-08-28 21:02:34 UTC (rev 235439)
@@ -57,7 +57,7 @@
        C246591F18902E150029092E /* ReadEvalPrintLoop.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReadEvalPrintLoop.m; sourceTree = "<group>"; };
        C246592118902EA40029092E /* ScriptInputSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInputSource.h; sourceTree = "<group>"; };
        C246592218902EA40029092E /* ScriptInputSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScriptInputSource.m; sourceTree = "<group>"; };
-       C296621018ADF56000752922 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = _javascript_Core.framework; path = ../../WebKitBuild/Debug/_javascript_Core.framework; sourceTree = "<group>"; };
+       C296621018ADF56000752922 /* _javascript_Core.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = _javascript_Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Modified: trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj (235438 => 235439)


--- trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj	2018-08-28 20:53:17 UTC (rev 235438)
+++ trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj	2018-08-28 21:02:34 UTC (rev 235439)
@@ -33,7 +33,7 @@
 		7C2227531AFC4D9C008C3338 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
 		7C4AB3A11AF0276C003FC8D1 /* lldbWebKitTester */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lldbWebKitTester; sourceTree = BUILT_PRODUCTS_DIR; };
 		7CB6844A1AFA7978002B305C /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = SOURCE_ROOT; };
-		CE6C3AFE20C0B17B003E33D8 /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWTF.a; sourceTree = "<group>"; };
+		CE6C3AFE20C0B17B003E33D8 /* libWTF.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		CE6C3B0020C0C443003E33D8 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to