Changeset 192375 in webkit
- Timestamp:
- Nov 12, 2015 12:02:32 PM (9 years ago)
- Location:
- trunk/Tools
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r192374 r192375 1 2015-11-12 Daniel Bates <dabates@apple.com> 2 3 Support building configuration Production of DumpRenderTree and WebKitTestRunner for iOS 4 https://bugs.webkit.org/show_bug.cgi?id=151191 5 6 Reviewed by Andy Estes. 7 8 * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove hardcoded SKIP_INTALL. 9 Will override this setting in DumpRenderTree.xcconfig. 10 * DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig: When building for iOS we now 11 compile source file DumpRenderTreeMain.mm to produce a built product and make the Apple 12 Internal build system happy. Do not waste time coping OpenType font files (*.otf files) 13 and skip installation when building for iOS since we are not interested in the build product 14 and are only building this target to make the Apple Internal build system happy. 15 * DumpRenderTree/mac/DumpRenderTreeMain.mm: 16 (main): Added dummy implementation for iOS so that we build an actual command line tool to 17 make the Apple Internal build system happy. 18 * WebKitTestRunner/Configurations/Base.xcconfig: Add iOS-specific definition for WEBKIT_UMBRELLA_FRAMEWORKS_DIR. 19 * WebKitTestRunner/Configurations/DebugRelease.xcconfig: Remove variable WEBKIT_UMBRELLA_FRAMEWORKS_DIR. 20 * WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig: Build file WebKitTestRunner/mac/main.mm 21 on iOS Only to produce a built product and make the Apple Internal build system happy. No need 22 to define OTHER_LDFLAGS when building this target for iOS as the default linker flags are sufficient. 23 * WebKitTestRunner/mac/main.mm: 24 (main): Added dummy implementation for iOS so that we build an actual command line tool to 25 make the Apple Internal build system happy. 26 1 27 2015-11-12 Chris Dumez <cdumez@apple.com> 2 28 -
trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
r190848 r192375 1166 1166 buildSettings = { 1167 1167 INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)"; 1168 SKIP_INSTALL = NO;1169 1168 }; 1170 1169 name = Production; -
trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTree.xcconfig
r188566 r192375 28 28 LD_RUNPATH_SEARCH_PATHS = "@loader_path/."; 29 29 PRODUCT_NAME = DumpRenderTree; 30 31 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = DumpRenderTreeMain.mm *.ttf *.TTF; 30 SKIP_INSTALL[sdk=macosx*] = NO; 31 SKIP_INSTALL[sdk=iphone*] = YES; 32 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *.ttf *.TTF *.otf; -
trunk/Tools/DumpRenderTree/mac/DumpRenderTreeMain.mm
r162573 r192375 24 24 */ 25 25 26 #if PLATFORM(MAC) 27 26 28 #include "DumpRenderTreeMac.h" 27 29 … … 30 32 return DumpRenderTreeMain(argc, argv); 31 33 } 34 35 #else 36 37 int main(int, const char*[]) 38 { 39 return 0; 40 } 41 42 #endif -
trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig
r191920 r192375 61 61 SDKROOT = macosx.internal; 62 62 63 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; 64 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; 63 PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks; 64 PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(SDKROOT)$(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; 65 66 WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION)); 67 WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering); 68 WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_DIR_engineering); 69 WEBCORE_PRIVATE_HEADERS_DIR_Production = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders; 70 WEBCORE_PRIVATE_HEADERS_DIR_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders; 65 71 66 72 FRAMEWORK_SEARCH_PATHS = $(inherited) $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; -
trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig
r190263 r192375 34 34 MACOSX_DEPLOYMENT_TARGET_101200 = 10.12; 35 35 36 WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);37 38 36 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphoneos*] = WebKitSystemInterfaceIOSDevice$(IPHONEOS_DEPLOYMENT_TARGET); 39 37 WEBKIT_SYSTEM_INTERFACE_LIBRARY[sdk=iphonesimulator*] = WebKitSystemInterfaceIOSSimulator$(IPHONEOS_DEPLOYMENT_TARGET); -
trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunner.xcconfig
r189455 r192375 28 28 PRODUCT_NAME = WebKitTestRunner; 29 29 GCC_ENABLE_OBJC_EXCEPTIONS = YES; 30 OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit;30 OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework Carbon -framework Cocoa -framework JavaScriptCore -framework WebKit; 31 31 SKIP_INSTALL[sdk=iphone*] = YES; 32 32 EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/*; 33 INCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = mac/main.mm; -
trunk/Tools/WebKitTestRunner/mac/main.mm
r189365 r192375 25 25 26 26 #import "config.h" 27 28 #if PLATFORM(MAC) 27 29 28 30 #import "TestController.h" … … 61 63 return 0; 62 64 } 65 66 #else 67 68 int main(int, const char*[]) 69 { 70 return 0; 71 } 72 73 #endif // PLATFORM(MAC)
Note: See TracChangeset
for help on using the changeset viewer.