https://bugs.webkit.org/show_bug.cgi?id=148881
Reviewed by Daniel Bates.
Since we don't want to create platform-specific schemes, all projects in the workspace's schemes need to build
for all supported platforms.
.:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme: Removed the DumpRenderTree target since its All
target was already included. Removed the WebKitTestRunner target and replaced it with its All target.
Source/WebInspectorUI:
* Configurations/Base.xcconfig: Included iphoneos and iphonesimulator in SUPPORTED_PLATFORMS.
* Configurations/WebInspectorUIFramework.xcconfig: Skipped installing on iOS.
Tools:
* MiniBrowser/Configurations/Base.xcconfig: Included iphoneos and iphonesimulator in SUPPORTED_PLATFORMS.
* MiniBrowser/Configurations/MiniBrowser.xcconfig: Excluded all source files on iOS, and linked Cocoa and WebKit on Mac.
* MiniBrowser/Configurations/MiniBrowserBundle.xcconfig: Ditto.
* MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: Stopped linking frameworks in Link Binaries With Libraries.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189462
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2015-09-06 Andy Estes <aestes@apple.com>
+
+ WebKit.xcworkspace should be be able to build iOS platforms
+ https://bugs.webkit.org/show_bug.cgi?id=148881
+
+ Reviewed by Daniel Bates.
+
+ Since we don't want to create platform-specific schemes, all projects in the workspace's schemes need to build
+ for all supported platforms.
+
+ * WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme: Removed the DumpRenderTree target since its All
+ target was already included. Removed the WebKitTestRunner target and replaced it with its All target.
+
2015-09-04 Jon Honeycutt <jhoneycutt@apple.com>
[iOS] Need a test for bug #145539: Uploading an animated GIF from the
+2015-09-06 Andy Estes <aestes@apple.com>
+
+ WebKit.xcworkspace should be be able to build iOS platforms
+ https://bugs.webkit.org/show_bug.cgi?id=148881
+
+ Reviewed by Daniel Bates.
+
+ Since we don't want to create platform-specific schemes, all projects in the workspace's schemes need to build
+ for all supported platforms.
+
+ * Configurations/Base.xcconfig: Included iphoneos and iphonesimulator in SUPPORTED_PLATFORMS.
+ * Configurations/WebInspectorUIFramework.xcconfig: Skipped installing on iOS.
+
2015-09-04 Brian Burg <bburg@apple.com>
Web Inspector: combine Test.html resources to make tests run faster
ENGINEERING_BUILD_DEFINES = $(ENGINEERING_BUILD_DEFINES_$(ENGINEERING_BUILD));
ENGINEERING_BUILD_DEFINES_1 = ENGINEERING_BUILD=1;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
SDKROOT = macosx.internal;
COMBINE_TEST_RESOURCES_Debug = YES;
COMBINE_TEST_RESOURCES_Release = YES;
COMBINE_TEST_RESOURCES_Production = YES;
+
+SKIP_INSTALL[sdk=iphone*] = YES;
+2015-09-06 Andy Estes <aestes@apple.com>
+
+ WebKit.xcworkspace should be be able to build iOS platforms
+ https://bugs.webkit.org/show_bug.cgi?id=148881
+
+ Reviewed by Daniel Bates.
+
+ Since we don't want to create platform-specific schemes, all projects in the workspace's schemes need to build
+ for all supported platforms.
+
+ * MiniBrowser/Configurations/Base.xcconfig: Included iphoneos and iphonesimulator in SUPPORTED_PLATFORMS.
+ * MiniBrowser/Configurations/MiniBrowser.xcconfig: Excluded all source files on iOS, and linked Cocoa and WebKit on Mac.
+ * MiniBrowser/Configurations/MiniBrowserBundle.xcconfig: Ditto.
+ * MiniBrowser/MiniBrowser.xcodeproj/project.pbxproj: Stopped linking frameworks in Link Binaries With Libraries.
+
2015-09-06 Andy Estes <aestes@apple.com>
WebKitTestRunner should build for iOS using the default target
LINKER_DISPLAYS_MANGLED_NAMES = YES;
GCC_NO_COMMON_BLOCKS = YES;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx;
+
TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
SDKROOT = macosx.internal;
PRODUCT_NAME = MiniBrowser
GCC_PREFIX_HEADER = mac/MiniBrowser_Prefix.pch
INFOPLIST_FILE = mac/Info.plist
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Cocoa -framework WebKit
PRODUCT_NAME = MiniBrowser
GCC_PREFIX_HEADER = mac/Bundle/MiniBrowserBundle_Prefix.pch
INFOPLIST_FILE = mac/Bundle/Info.plist
+EXCLUDED_SOURCE_FILE_NAMES[sdk=iphone*] = *
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited) -framework Cocoa
objects = {
/* Begin PBXBuildFile section */
- 0F7EB6E3134113C300F4D865 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F7EB6E2134113C300F4D865 /* WebKit.framework */; };
0FE643A1161FA8940059E3FF /* BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FE643A0161FA8940059E3FF /* BrowserWindowController.m */; };
0FE643A4161FAC660059E3FF /* WK1BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0FE643A3161FAC660059E3FF /* WK1BrowserWindowController.m */; };
- 1AFFEF771860EE6800DA465E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AFFEF761860EE6800DA465E /* Cocoa.framework */; };
1AFFEF8818611C3D00DA465E /* MiniBrowserWebProcessPlugIn.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AFFEF8618611C3D00DA465E /* MiniBrowserWebProcessPlugIn.m */; };
1AFFEF8B18611D8A00DA465E /* MiniBrowser.wkbundle in Copy Bundle */ = {isa = PBXBuildFile; fileRef = 1AFFEF751860EE6700DA465E /* MiniBrowser.wkbundle */; };
256AC3DA0F4B6AC300CF3369 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* AppDelegate.m */; };
51E244FA11EFCE07008228D1 /* MBToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 51E244F911EFCE07008228D1 /* MBToolbarItem.m */; };
7CA379421AC381C10079DC37 /* ExtensionManagerWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CA379401AC381C10079DC37 /* ExtensionManagerWindowController.m */; };
7CA379431AC381C10079DC37 /* ExtensionManagerWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7CA379411AC381C10079DC37 /* ExtensionManagerWindowController.xib */; };
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
BC329487116A92E2008635D0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329486116A92E2008635D0 /* main.m */; };
BC329498116A941B008635D0 /* WK2BrowserWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC329497116A941B008635D0 /* WK2BrowserWindowController.m */; };
BC72B89511E57E07001EB4EA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58150DA1D0A300B32029 /* MainMenu.xib */; };
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 0F7EB6E2134113C300F4D865 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0FE6439F161FA8940059E3FF /* BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BrowserWindowController.h; path = mac/BrowserWindowController.h; sourceTree = "<group>"; };
0FE643A0161FA8940059E3FF /* BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = BrowserWindowController.m; path = mac/BrowserWindowController.m; sourceTree = "<group>"; };
0FE643A2161FAC660059E3FF /* WK1BrowserWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WK1BrowserWindowController.h; path = mac/WK1BrowserWindowController.h; sourceTree = "<group>"; };
0FE643A3161FAC660059E3FF /* WK1BrowserWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WK1BrowserWindowController.m; path = mac/WK1BrowserWindowController.m; sourceTree = "<group>"; };
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
1AFF1A6C1AC35D45007AB10C /* MiniBrowser.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = MiniBrowser.entitlements; sourceTree = "<group>"; };
1AFFEF751860EE6700DA465E /* MiniBrowser.wkbundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MiniBrowser.wkbundle; sourceTree = BUILT_PRODUCTS_DIR; };
1AFFEF761860EE6800DA465E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 1AFFEF771860EE6800DA465E /* Cocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
- 0F7EB6E3134113C300F4D865 /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
name = MiniBrowser;
sourceTree = "<group>";
};
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
- isa = PBXGroup;
- children = (
- 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
- 0F7EB6E2134113C300F4D865 /* WebKit.framework */,
- );
- name = "Linked Frameworks";
- sourceTree = "<group>";
- };
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
isa = PBXGroup;
children = (
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
1AFFEF761860EE6800DA465E /* Cocoa.framework */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
);
</ExecutionAction>
</PreActions>
<BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "9340994A08540CAE007F3BC8"
- BuildableName = "DumpRenderTree"
- BlueprintName = "DumpRenderTree"
- ReferencedContainer = "container:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "8DD76F960486AA7600D96B5E"
- BuildableName = "WebKitTestRunner"
- BlueprintName = "WebKitTestRunner"
+ BlueprintIdentifier = "A18510171B9ADE0B00744AEB"
+ BuildableName = "All"
+ BlueprintName = "All"
ReferencedContainer = "container:Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
+ shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "A84F608D08B1370600E9745F"
+ BuildableName = "All"
+ BlueprintName = "All"
+ ReferencedContainer = "container:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ <AdditionalOptions>
+ </AdditionalOptions>
</TestAction>
<LaunchAction
+ buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "YES"
customWorkingDirectory = "$(SRCROOT)/../../LayoutTests"
- buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
allowLocationSimulation = "YES">
- <BuildableProductRunnable>
+ <MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
- BlueprintIdentifier = "9340994A08540CAE007F3BC8"
- BuildableName = "DumpRenderTree"
- BlueprintName = "DumpRenderTree"
+ BlueprintIdentifier = "A84F608D08B1370600E9745F"
+ BuildableName = "All"
+ BlueprintName = "All"
ReferencedContainer = "container:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
</BuildableReference>
- </BuildableProductRunnable>
+ </MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
+ buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "A84F608D08B1370600E9745F"
+ BuildableName = "All"
+ BlueprintName = "All"
+ ReferencedContainer = "container:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">