Changeset 185832 in webkit

Timestamp:

Jun 22, 2015 10:04:08 AM (9 years ago)

Author:

mitz@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Configurations/SandboxProfiles.xcconfig (added)
• WebKit2.xcodeproj/project.pbxproj (modified) (6 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-22  Dan Bernstein  <mitz@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  <antti@apple.com>
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -2105 +2105 @@
                         isa = PBXCopyFilesBuildPhase;
                         buildActionMask = 2147483647;
-                        dstPath = /usr/local/share/sandbox/profiles/embedded/builtin;
+                        dstPath = "$(INSTALL_PATH)";
                         dstSubfolderSpec = 0;
                         files = (
@@ -2981 +2981 @@
                 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>"; };
@@ -4496 +4497 @@
                                 BC8283F416B4FC5300A278FE /* PluginService.64.xcconfig */,
                                 5D442A5516D5856700AC3331 /* PluginService.entitlements */,
+                                37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */,
                                 A1EDD2DC1884B9B500BBFE98 /* SecItemShim.xcconfig */,
                                 5183B3931379F85C00E8754E /* Shim.xcconfig */,
@@ -10626 +10628 @@
                 A7AADA1119395CA9003EA1C7 /* Debug */ = {
                         isa = XCBuildConfiguration;
+                        baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
                         buildSettings = {
                                 PRODUCT_NAME = "$(TARGET_NAME)";
@@ -10633 +10636 @@
                 A7AADA1219395CA9003EA1C7 /* Release */ = {
                         isa = XCBuildConfiguration;
+                        baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
                         buildSettings = {
                                 PRODUCT_NAME = "$(TARGET_NAME)";
@@ -10640 +10644 @@
                 A7AADA1319395CA9003EA1C7 /* Production */ = {
                         isa = XCBuildConfiguration;
+                        baseConfigurationReference = 37E83D401B37D27B002079EE /* SandboxProfiles.xcconfig */;
                         buildSettings = {
                                 PRODUCT_NAME = "$(TARGET_NAME)";