Title: [246617] trunk/Tools
- Revision
- 246617
- Author
- [email protected]
- Date
- 2019-06-19 17:14:11 -0700 (Wed, 19 Jun 2019)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246616 => 246617)
--- trunk/Tools/ChangeLog 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/ChangeLog 2019-06-20 00:14:11 UTC (rev 246617)
@@ -1,3 +1,38 @@
+2019-06-19 Keith Rollin <[email protected]>
+
+ 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-19 Aakash Jain <[email protected]>
[ews-build] Patch link should open the pretty patch
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (246616 => 246617)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2019-06-20 00:14:11 UTC (rev 246617)
@@ -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,7 +1385,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
buildSettings = {
- WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources;
};
name = Production;
};
@@ -1393,7 +1391,6 @@
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;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig (246616 => 246617)
--- trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig 2019-06-20 00:14:11 UTC (rev 246617)
@@ -111,3 +111,6 @@
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;
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (246616 => 246617)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig 2019-06-20 00:14:11 UTC (rev 246617)
@@ -32,3 +32,9 @@
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);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig (246616 => 246617)
--- trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig 2019-06-20 00:14:11 UTC (rev 246617)
@@ -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);
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig (246616 => 246617)
--- trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig 2019-06-20 00:14:11 UTC (rev 246617)
@@ -27,7 +27,12 @@
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;
Modified: trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig (246616 => 246617)
--- trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2019-06-20 00:13:59 UTC (rev 246616)
+++ trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig 2019-06-20 00:14:11 UTC (rev 246617)
@@ -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);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
