Diff
Modified: trunk/Tools/ChangeLog (204385 => 204386)
--- trunk/Tools/ChangeLog 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/ChangeLog 2016-08-11 21:17:44 UTC (rev 204386)
@@ -1,3 +1,24 @@
+2016-08-11 Simon Fraser <[email protected]>
+
+ iOS DRT/WTR project cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=160778
+
+ Reviewed by Tim Horton.
+
+ Move TARGETED_DEVICE_FAMILY from the project to an xcconfig file.
+
+ Remove AppDelegate.* which were unused.
+
+ Exclude ios/Launch.storyboard on more platforms.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+ * DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig:
+ * WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig:
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ * WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h: Removed.
+ * WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m: Removed.
+ (-[AppDelegate application:didFinishLaunchingWithOptions:]): Deleted.
+
2016-08-11 Alex Christensen <[email protected]>
Fix Yosemite bots' cookie accept policies after r204365.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (204385 => 204386)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2016-08-11 21:17:44 UTC (rev 204386)
@@ -1202,7 +1202,6 @@
baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
- TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
};
@@ -1211,7 +1210,6 @@
baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
- TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
};
@@ -1220,7 +1218,6 @@
baseConfigurationReference = A19317FD18928738001C52B1 /* DumpRenderTreeApp.xcconfig */;
buildSettings = {
INFOPLIST_FILE = "$(SRCROOT)/ios/Info.plist";
- TARGETED_DEVICE_FAMILY = "1,2";
};
name = Production;
};
Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig (204385 => 204386)
--- trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DumpRenderTreeApp.xcconfig 2016-08-11 21:17:44 UTC (rev 204386)
@@ -34,6 +34,9 @@
LD_RUNPATH_SEARCH_PATHS = "@loader_path/.";
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/*;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = ios/Launch.storyboard;
+EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = ios/Launch.storyboard;
PRODUCT_NAME = DumpRenderTree;
+TARGETED_DEVICE_FAMILY = 1,2;
Modified: trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig (204385 => 204386)
--- trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/WebKitTestRunner/Configurations/WebKitTestRunnerApp.xcconfig 2016-08-11 21:17:44 UTC (rev 204386)
@@ -26,9 +26,15 @@
#include "BaseTarget.xcconfig"
PRODUCT_NAME = WebKitTestRunner;
+
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+
OTHER_LDFLAGS = $(inherited) -l$(WEBKIT_SYSTEM_INTERFACE_LIBRARY) -lWebKitTestRunner -framework _javascript_Core -framework CoreGraphics -framework QuartzCore -framework ImageIO -framework IOKit -framework UIKit -framework WebKit -framework Foundation;
+
SKIP_INSTALL[sdk=macosx*] = YES;
+
EXCLUDED_SOURCE_FILE_NAMES[sdk=macosx*] = ios/* AppDelegate.m;
EXCLUDED_SOURCE_FILE_NAMES[sdk=appletv*] = ios/Launch.storyboard;
EXCLUDED_SOURCE_FILE_NAMES[sdk=watch*] = ios/Launch.storyboard;
+
+TARGETED_DEVICE_FAMILY = 1,2;
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (204385 => 204386)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2016-08-11 21:17:44 UTC (rev 204386)
@@ -69,7 +69,6 @@
2E63ED911891ADAD002A7AFC /* PlatformWebViewIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */; };
2E63ED921891ADAD002A7AFC /* TestControllerIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */; };
2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D161890A9FB0010ED21 /* mainIOS.mm */; };
- 2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52CF21890A9A80010ED21 /* AppDelegate.m */; };
2E63ED9E1891AEC1002A7AFC /* WebArchiveDumpSupportIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */; };
2E63EDA11891B291002A7AFC /* AccessibilityUIElementIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2E63ED781891ACE9002A7AFC /* AccessibilityUIElementIOS.mm */; };
2E63EDA61891BDC0002A7AFC /* TestRunner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCC9981711D3F51E0017BCA2 /* TestRunner.cpp */; };
@@ -246,8 +245,6 @@
2EE52CE21890A9A80010ED21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
2EE52CE41890A9A80010ED21 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
2EE52CEA1890A9A80010ED21 /* WebKitTestRunnerApp-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "WebKitTestRunnerApp-Info.plist"; path = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist"; sourceTree = "<group>"; };
- 2EE52CF11890A9A80010ED21 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
- 2EE52CF21890A9A80010ED21 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformWebViewIOS.mm; sourceTree = "<group>"; };
2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestControllerIOS.mm; sourceTree = "<group>"; };
2EE52D151890A9FB0010ED21 /* WebArchiveDumpSupportIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebArchiveDumpSupportIOS.mm; sourceTree = "<group>"; };
@@ -558,8 +555,6 @@
2EE52CE81890A9A80010ED21 /* WebKitTestRunnerApp */ = {
isa = PBXGroup;
children = (
- 2EE52CF11890A9A80010ED21 /* AppDelegate.h */,
- 2EE52CF21890A9A80010ED21 /* AppDelegate.m */,
0F4B08721D5BE88D00EC1B78 /* Launch.storyboard */,
2EE52D161890A9FB0010ED21 /* mainIOS.mm */,
);
@@ -933,7 +928,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 2E63ED9C1891ADC7002A7AFC /* AppDelegate.m in Sources */,
2E749BF21891EBFA007FC175 /* EventSenderProxyIOS.mm in Sources */,
0FEBF85A1BB61DF20028722D /* HIDEventGenerator.mm in Sources */,
2E63ED941891ADAD002A7AFC /* mainIOS.mm in Sources */,
@@ -1105,7 +1099,6 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
- TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Debug;
@@ -1118,7 +1111,6 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
- TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Release;
@@ -1131,7 +1123,6 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
INFOPLIST_FILE = "WebKitTestRunnerApp/WebKitTestRunnerApp-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
- TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Production;
Deleted: trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h (204385 => 204386)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.h 2016-08-11 21:17:44 UTC (rev 204386)
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end
Deleted: trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m (204385 => 204386)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m 2016-08-11 20:49:32 UTC (rev 204385)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunnerApp/AppDelegate.m 2016-08-11 21:17:44 UTC (rev 204386)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import "AppDelegate.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
- self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- self.window.backgroundColor = [UIColor whiteColor];
- [self.window makeKeyAndVisible];
- return YES;
-}
-
-@end
