Changeset 192375 in webkit

Timestamp:

Nov 12, 2015 12:02:32 PM (9 years ago)

Author:

dbates@webkit.org

Message:

Support building configuration Production of DumpRenderTree and WebKitTestRunner for iOS
​https://bugs.webkit.org/show_bug.cgi?id=151191

Reviewed by Andy Estes.

• DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove hardcoded SKIP_INTALL.

Will override this setting in DumpRenderTree.xcconfig.

• DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: When building for iOS we now

compile source file DumpRenderTreeMain.mm to produce a built product and make the Apple
Internal build system happy. Do not waste time coping OpenType font files (*.otf files)
and skip installation when building for iOS since we are not interested in the build product
and are only building this target to make the Apple Internal build system happy.

• DumpRenderTree/mac/DumpRenderTreeMain.mm:

(main): Added dummy implementation for iOS so that we build an actual command line tool to
make the Apple Internal build system happy.

• WebKitTestRunner/Configurations/Base.xcconfig: Add iOS-specific definition for WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
• WebKitTestRunner/Configurations/DebugRelease.xcconfig: Remove variable WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
• WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Build file WebKitTestRunner/mac/main.mm

on iOS Only to produce a built product and make the Apple Internal build system happy. No need
to define OTHER_LDFLAGS when building this target for iOS as the default linker flags are sufficient.

• WebKitTestRunner/mac/main.mm:

(main): Added dummy implementation for iOS so that we build an actual command line tool to
make the Apple Internal build system happy.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (modified) (1 diff)
• DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTreeMain.mm (modified) (2 diffs)
• WebKitTestRunner/Configurations/Base.xcconfig (modified) (1 diff)
• WebKitTestRunner/Configurations/DebugRelease.xcconfig (modified) (1 diff)
• WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig (modified) (1 diff)
• WebKitTestRunner/mac/main.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-11-12  Daniel Bates  <dabates@apple.com>
+
+        Support building configuration Production of DumpRenderTree and WebKitTestRunner for iOS
+        https://bugs.webkit.org/show_bug.cgi?id=151191
+
+        Reviewed by Andy Estes.
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove hardcoded SKIP_INTALL.
+        Will override this setting in DumpRenderTree.xcconfig.
+        * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: When building for iOS we now
+        compile source file DumpRenderTreeMain.mm to produce a built product and make the Apple
+        Internal build system happy. Do not waste time coping OpenType font files (*.otf files)
+        and skip installation when building for iOS since we are not interested in the build product
+        and are only building this target to make the Apple Internal build system happy.
+        * DumpRenderTree/mac/DumpRenderTreeMain.mm:
+        (main): Added dummy implementation for iOS so that we build an actual command line tool to
+        make the Apple Internal build system happy.
+        * WebKitTestRunner/Configurations/Base.xcconfig: Add iOS-specific definition for WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig: Remove variable WEBKIT_UMBRELLA_FRAMEWORKS_DIR.
+        * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Build file WebKitTestRunner/mac/main.mm
+        on iOS Only to produce a built product and make the Apple Internal build system happy. No need
+        to define OTHER_LDFLAGS when building this target for iOS as the default linker flags are sufficient.
+        * WebKitTestRunner/mac/main.mm:
+        (main): Added dummy implementation for iOS so that we build an actual command line tool to
+        make the Apple Internal build system happy.
+
 2015-11-12  Chris Dumez  <cdumez@apple.com>
 

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

@@ -1166 +1166 @@
                         buildSettings = {
                                 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
-                                SKIP_INSTALL = NO;
                         };
                         name = Production;

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

@@ -28 +28 @@
 LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
 PRODUCT_NAME = DumpRenderTree;
-
-EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF;
+SKIP_INSTALL[sdk=macosx*] = NO;
+SKIP_INSTALL[sdk=iphone*] = YES;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf;

trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm

@@ -24 +24 @@
  */
 
+#if PLATFORM(MAC)
+
 #include "DumpRenderTreeMac.h"
 
@@ -30 +32 @@
     return DumpRenderTreeMain(argc, argv);
 }
+
+#else
+
+int main(int, const char*[])
+{
+    return 0;
+}
+
+#endif

trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

@@ -61 +61 @@
 SDKROOT = macosx.internal;
 
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
+PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
+
+WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
+WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering);
+WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
+WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
 
 FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;

trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

@@ -34 +34 @@
 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12;
 
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET);
 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET);

trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig

@@ -28 +28 @@
 PRODUCT_NAME = WebKitTestRunner;
 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;
 SKIP_INSTALL[sdk=iphone*] = YES;
 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*;
+INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm;

trunk/Tools/WebKitTestRunner/mac/main.mm

@@ -25 +25 @@
 
 #import "config.h"
+
+#if PLATFORM(MAC)
 
 #import "TestController.h"
@@ -61 +63 @@
     return 0;
 }
+
+#else
+
+int main(int, const char*[])
+{
+    return 0;
+}
+
+#endif // PLATFORM(MAC)