Changeset 246617 in webkit


Ignore:
Timestamp:
Jun 19, 2019 5:14:11 PM (5 years ago)
Author:
Keith Rollin
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:
Location:
trunk/Tools
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r246613 r246617  
     12019-06-19  Keith Rollin  <krollin@apple.com>
     2
     3        Relocate some test tools in non-mac builds
     4        https://bugs.webkit.org/show_bug.cgi?id=198984
     5        <rdar://problem/51873261>
     6
     7        Reviewed by Andy Estes.
     8
     9        The tools DumpRenderTree, WebKitTestRunner, LayoutTestHelper, and
     10        TestNetscapePlugin get created in
     11        WebKit.framework/Versions/A/Resources on non-mac builds. This is
     12        incorrect, as those bundles are shallow bundles that don't use the
     13        Versions hierarchy. Instead, store these files directly in
     14        WebKit.framework.
     15
     16        Note that getting rid of just the "Versions/A" path components and
     17        putting the files in WebKit.framework/Resources doesn't work as
     18        `codesign` treats the result as an invalid layout.
     19
     20        The work in this patch involves changing the definition of the custom
     21        build variable WEBKIT_FRAMEWORK_RESOURCES_PATH. The standard build
     22        variable INSTALL_PATH is defined in terms of this variable. In order
     23        to increase visiblity into this relationship, move both of these
     24        variables into .xcconfig files if they weren't already. This
     25        refactoring was done in a way to be the least disruptive and most
     26        compatible with the previous definitions, even at the cost of being
     27        repetitive.
     28
     29        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
     30        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     31        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig:
     32        * DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig:
     33        * DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig:
     34        * WebKitTestRunner/Configurations/BaseTarget.xcconfig:
     35
    1362019-06-19  Aakash Jain  <aakash_jain@apple.com>
    237

  • trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

    r246141 r246617  
    13501350                        baseConfigurationReference = A1103B5B1892498F00738C87 /* LayoutTestHelper.xcconfig */;
    13511351                        buildSettings = {
    1352                                 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
    13531352                                PRODUCT_NAME = LayoutTestHelper;
    13541353                                SKIP_INSTALL = NO;
    … …  
    13871386                        baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
    13881387                        buildSettings = {
    1389                                 WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework/Versions/A/Resources;
    13901388                        };
    13911389                        name = Production;
    … …  
    13941392                        isa = XCBuildConfiguration;
    13951393                        buildSettings = {
    1396                                 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
    13971394                                PRODUCT_NAME = All;
    13981395                                USE_EXPORT_MACROS = 0;
    … …  
    14041401                        baseConfigurationReference = BCB281F00CFA713D007E533E /* DumpRenderTree.xcconfig */;
    14051402                        buildSettings = {
    1406                                 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
    14071403                        };
    14081404                        name = Production;
    … …  
    14131409                        buildSettings = {
    14141410                                INFOPLIST_FILE = TestNetscapePlugIn/mac/Info.plist;
    1415                                 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
    14161411                                SKIP_INSTALL = NO;
    14171412                        };

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r246285 r246617  
    112112OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
    113113OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
     114
     115WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework;
     116WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig

    r246282 r246617  
    3333SKIP_INSTALL[sdk=iphone*] = YES;
    3434EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf;
     35
     36INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
     37INSTALL_PATH_Release = $(INSTALL_PATH);
     38INSTALL_PATH_Debug = $(INSTALL_PATH);
     39INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
     40INSTALL_PATH_engineering = $(INSTALL_PATH);

  • trunk/Tools/DumpRenderTree/mac/Configurations/LayoutTestHelper.xcconfig

    r246282 r246617  
    2828OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Carbon -framework Cocoa -framework OpenGL -framework IOKit;
    2929STRIP_STYLE = debugging;
     30
     31INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
     32INSTALL_PATH_Release = $(INSTALL_PATH);
     33INSTALL_PATH_Debug = $(INSTALL_PATH);
     34INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
     35INSTALL_PATH_engineering = $(INSTALL_PATH);

  • trunk/Tools/DumpRenderTree/mac/Configurations/TestNetscapePlugIn.xcconfig

    r209288 r246617  
    2828WRAPPER_EXTENSION = plugin
    2929INFOPLIST_FILE = TestNetscapePlugIn.subproj/Info.plist
    30 INSTALL_PATH = "$(USER_LIBRARY_DIR)/Plugins"
    3130WARNING_CFLAGS = -Wmost -Wno-four-char-constants -Wno-unknown-pragmas
    3231LIBRARY_STYLE = BUNDLE
    3332EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *;
     33
     34INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION))
     35INSTALL_PATH_Release = $(USER_LIBRARY_DIR)/Plugins;
     36INSTALL_PATH_Debug = $(USER_LIBRARY_DIR)/Plugins;
     37INSTALL_PATH_Production = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
     38INSTALL_PATH_engineering = $(USER_LIBRARY_DIR)/Plugins;

  • trunk/Tools/WebKitTestRunner/Configurations/BaseTarget.xcconfig

    r240211 r246617  
    2222// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323
    24 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Resources;
     24WEBKIT_FRAMEWORK_RESOURCES_PATH = WebKit.framework;
     25WEBKIT_FRAMEWORK_RESOURCES_PATH[sdk=macosx*] = WebKit.framework/Versions/A/Resources;
     26
     27INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH);
Note: See TracChangeset for help on using the changeset viewer.