WebKit Bugzilla
Attachment 372408 Details for
Bug 198984
: Relocate some test tools in non-mac builds
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-198984-20190618170731.patch (text/plain), 3.48 KB, created by
Keith Rollin
on 2019-06-18 17:07:32 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Keith Rollin
Created:
2019-06-18 17:07:32 PDT
Size:
3.48 KB
patch
obsolete
>Subversion Revision: 246519 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index e8ca79f7c379911a1db4896b67b7813b8a368222..853716aa1ce68b88976b8b13d3f3e2d6ab10e9a1 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,26 @@ >+2019-06-18 Keith Rollin <krollin@apple.com> >+ >+ Relocate some test tools in non-mac builds >+ https://bugs.webkit.org/show_bug.cgi?id=198984 >+ <rdar://problem/51873261> >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ The tools DumpRenderTree, WebKitTestRunner, LayoutTestHelper, and >+ TestNetscapePlugin get created in >+ WebKit.framework/Versions/A/Resources on non-mac builds. This is >+ incorrect, as those bundles are shallow bundles that don't use the >+ Versions hierarchy. Instead, store these files directly in >+ WebKit.framework. >+ >+ Note that getting rid of just the "Versions/A" path components and >+ putting the files in WebKit.framework/Resources doesn't work as >+ `codesign` treats this as an invalid layout. >+ >+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: >+ * DumpRenderTree/mac/Configurations/Base.xcconfig: >+ * WebKitTestRunner/Configurations/BaseTarget.xcconfig: >+ > 2019-06-17 Adrian Perez de Castro <aperez@igalia.com> > > [Flatpak][JHBuild] Update build environments to use WPEBackend-fdo 1.3.1 >diff --git a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >index 463b60991bada337569d82980b3cfdf4528792d3..b9cc4cf71d8089523b1306ea1b972eaba4a30e43 100644 >--- a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >+++ b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj >@@ -1386,7 +1386,6 @@ > isa = XCBuildConfiguration; > baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */; > buildSettings = { >- WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources; > }; > name = Production; > }; >diff --git a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig >index 0ebf1b063c81988f84f5fbda7a46fb03bbbb04ec..f22a11fb841179cd4f945678dcc02d18fbce7112 100644 >--- a/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig >+++ b/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig >@@ -111,3 +111,6 @@ SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos w > OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS); > OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS); > OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS); >+ >+WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework; >+WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources; >diff --git a/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig b/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig >index 3b585397561e4fd952a5e83e01c8c97a520c4ab6..85e60aeb5d119c0cd93e7863611bc30fee6ad47f 100644 >--- a/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig >+++ b/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig >@@ -21,4 +21,7 @@ > // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > >-INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources; >+WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework; >+WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources; >+ >+INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198984
:
372408
|
372495