Title: [185832] trunk/Source/WebKit2
- Revision
- 185832
- Author
- m...@apple.com
- Date
- 2015-06-22 10:04:08 -0700 (Mon, 22 Jun 2015)
Log Message
Part 1 of [Xcode] Fold the WebKit2SandboxProfiles-IOSOverride target into the Sandbox Profiles target
https://bugs.webkit.org/show_bug.cgi?id=146197
Reviewed by Anders Carlsson.
* Configurations/SandboxProfiles.xcconfig: Added. Defines INSTALL_PATH based on the value
of WK_INSTALL_OVERRIDE_SANDBOX_PROFILES.
* WebKit2.xcodeproj/project.pbxproj: Use SandboxProfiles.xcconfig for the Sandbox Profiles
target, and change the destination path in its Copy Files build phase to INSTALL_PATH.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185831 => 185832)
--- trunk/Source/WebKit2/ChangeLog 2015-06-22 16:35:33 UTC (rev 185831)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-22 17:04:08 UTC (rev 185832)
@@ -1,3 +1,15 @@
+2015-06-22 Dan Bernstein <m...@apple.com>
+
+ Part 1 of [Xcode] Fold the WebKit2SandboxProfiles-IOSOverride target into the Sandbox Profiles target
+ https://bugs.webkit.org/show_bug.cgi?id=146197
+
+ Reviewed by Anders Carlsson.
+
+ * Configurations/SandboxProfiles.xcconfig: Added. Defines INSTALL_PATH based on the value
+ of WK_INSTALL_OVERRIDE_SANDBOX_PROFILES.
+ * WebKit2.xcodeproj/project.pbxproj: Use SandboxProfiles.xcconfig for the Sandbox Profiles
+ target, and change the destination path in its Copy Files build phase to INSTALL_PATH.
+
2015-06-22 Antti Koivisto <an...@apple.com>
Crash replacing TabDocument in MobileSafari at WebKit: -[WKWebView(WKPrivate) _beginAnimatedResizeWithUpdates:]
Added: trunk/Source/WebKit2/Configurations/SandboxProfiles.xcconfig (0 => 185832)
--- trunk/Source/WebKit2/Configurations/SandboxProfiles.xcconfig (rev 0)
+++ trunk/Source/WebKit2/Configurations/SandboxProfiles.xcconfig 2015-06-22 17:04:08 UTC (rev 185832)
@@ -0,0 +1,4 @@
+INSTALL_PATH = $(INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_$(WK_INSTALL_OVERRIDE_SANDBOX_PROFILES));
+INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_ = $(INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO);
+INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_NO = /usr/local/share/sandbox/profiles/embedded/builtin;
+INSTALL_PATH_WK_INSTALL_OVERRIDE_SANDBOX_PROFILES_YES = /usr/local/share/sandbox;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185831 => 185832)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-22 16:35:33 UTC (rev 185831)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-22 17:04:08 UTC (rev 185832)
@@ -2104,7 +2104,7 @@
A7AADA1519395CC3003EA1C7 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
- dstPath = /usr/local/share/sandbox/profiles/embedded/builtin;
+ dstPath = "$(INSTALL_PATH)";
dstSubfolderSpec = 0;
files = (
A78CCDDA193AC9F4005ECC25 /* com.apple.WebKit.Databases.sb in CopyFiles */,
@@ -2980,6 +2980,7 @@
37C4C0921814B3AF003688B9 /* WKNSArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNSArray.h; sourceTree = "<group>"; };
37DFA6FF1810BB92001F4A9F /* WKFoundation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFoundation.h; sourceTree = "<group>"; };
37E25D6D18FDE5D6005D3A00 /* APIFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIFormClient.h; sourceTree = "<group>"; };
+ 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SandboxProfiles.xcconfig; sourceTree = "<group>"; };
37F623B712A57B6200E3FDF6 /* WKFindOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFindOptions.h; sourceTree = "<group>"; };
37FC19461850FBF2008CFA47 /* WKBrowsingContextLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextLoadDelegatePrivate.h; sourceTree = "<group>"; };
37FC194818510D6A008CFA47 /* WKNSURLAuthenticationChallenge.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKNSURLAuthenticationChallenge.mm; sourceTree = "<group>"; };
@@ -4495,6 +4496,7 @@
BCBECDC216B5CE2A00047A1A /* PluginService.64.Development.xcconfig */,
BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
5D442A5516D5856700AC3331 /* PluginService.entitlements */,
+ 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
5183B3931379F85C00E8754E /* Shim.xcconfig */,
1A4F976E100E7B6600637A18 /* Version.xcconfig */,
@@ -10625,6 +10627,7 @@
};
A7AADA1119395CA9003EA1C7 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -10632,6 +10635,7 @@
};
A7AADA1219395CA9003EA1C7 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -10639,6 +10643,7 @@
};
A7AADA1319395CA9003EA1C7 /* Production */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
buildSettings = {
PRODUCT_NAME = "$(TARGET_NAME)";
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
