Attachment 372495 Details for Bug 198984 – Patch

[patch] Patch

bug-198984-20190619151616.patch (text/plain), 8.08 KB, created by Keith Rollin on 2019-06-19 15:16:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-06-19 15:16:16 PDT

Size: 8.08 KB

patch

obsolete

>Subversion Revision: 246519
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e8ca79f7c379911a1db4896b67b7813b8a368222..6c909ea7f467d12bf273f9ee4875cbdf660d2e3c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,38 @@
>+2019-06-19  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 Andy Estes.
>+
>+        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 the result as an invalid layout.
>+
>+        The work in this patch involves changing the definition of the custom
>+        build variable WEBKIT_FRAMEWORK_RESOURCES_PATH. The standard build
>+        variable INSTALL_PATH is defined in terms of this variable. In order
>+        to increase visiblity into this relationship, move both of these
>+        variables into .xcconfig files if they weren't already. This
>+        refactoring was done in a way to be the least disruptive and most
>+        compatible with the previous definitions, even at the cost of being
>+        repetitive.
>+
>+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
>+        * DumpRenderTree/mac/Configurations/Base.xcconfig:
>+        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
>+        * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
>+        * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.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..d140c382b7763ee7c2b446a0c221385afceb6090 100644
>--- a/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
>+++ b/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
>@@ -1349,7 +1349,6 @@
> 			isa = XCBuildConfiguration;
> 			baseConfigurationReference = A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */;
> 			buildSettings = {
>-				INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
> 				PRODUCT_NAME = LayoutTestHelper;
> 				SKIP_INSTALL = NO;
> 			};
>@@ -1386,14 +1385,12 @@
> 			isa = XCBuildConfiguration;
> 			baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
> 			buildSettings = {
>-				WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources;
> 			};
> 			name = Production;
> 		};
> 		90CBC3510F748B1300A712B7 /* Production */ = {
> 			isa = XCBuildConfiguration;
> 			buildSettings = {
>-				INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
> 				PRODUCT_NAME = All;
> 				USE_EXPORT_MACROS = 0;
> 			};
>@@ -1403,7 +1400,6 @@
> 			isa = XCBuildConfiguration;
> 			baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
> 			buildSettings = {
>-				INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
> 			};
> 			name = Production;
> 		};
>@@ -1412,7 +1408,6 @@
> 			baseConfigurationReference = BCB283DE0CFA7C20007E533E /* TestNetscapePlugIn.xcconfig */;
> 			buildSettings = {
> 				INFOPLIST_FILE = TestNetscapePlugIn/mac/Info.plist;
>-				INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
> 				SKIP_INSTALL = NO;
> 			};
> 			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/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
>index 711f77c110cd18d41a0aa522faadc8b74c1ecf44..23d3438feadb454ac825f4b54498a53e28c4d724 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
>@@ -32,3 +32,9 @@ PRODUCT_NAME = DumpRenderTree;
> SKIP_INSTALL[sdk=macosx*] = NO;
> SKIP_INSTALL[sdk=iphone*] = YES;
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf;
>+
>+INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
>+INSTALL_PATH_Release = $(INSTALL_PATH);
>+INSTALL_PATH_Debug = $(INSTALL_PATH);
>+INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
>+INSTALL_PATH_engineering = $(INSTALL_PATH);
>diff --git a/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig b/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig
>index de644cc5cd17c13a1e59403fdfa4c9369ca79ec6..63c491030402723b097d2834a061671866d5adc6 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig
>@@ -27,3 +27,9 @@
> 
> OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
> STRIP_STYLE = debugging;
>+
>+INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
>+INSTALL_PATH_Release = $(INSTALL_PATH);
>+INSTALL_PATH_Debug = $(INSTALL_PATH);
>+INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
>+INSTALL_PATH_engineering = $(INSTALL_PATH);
>diff --git a/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig b/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig
>index 84a8364a66f246dd9b998493e9452c41748700b4..64aa53a988457e1fd7f3ebd7a18e8df2cac776dd 100644
>--- a/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig
>+++ b/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig
>@@ -27,7 +27,12 @@ PRODUCT_NAME = TestNetscapePlugIn
> PRODUCT_BUNDLE_IDENTIFIER = com.apple.testnetscapeplugin
> WRAPPER_EXTENSION = plugin
> INFOPLIST_FILE = TestNetscapePlugIn.subproj/Info.plist
>-INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"
> WARNING_CFLAGS = -Wmost -Wno-four-char-constants -Wno-unknown-pragmas
> LIBRARY_STYLE = BUNDLE
> EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *;
>+
>+INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
>+INSTALL_PATH_Release = $(USER_LIBRARY_DIR)/Plugins;
>+INSTALL_PATH_Debug = $(USER_LIBRARY_DIR)/Plugins;
>+INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
>+INSTALL_PATH_engineering = $(USER_LIBRARY_DIR)/Plugins;
>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);

Actions: View | Formatted Diff | Diff

Attachments on bug 198984: 372408 | 372495