Changeset 243567 in webkit

Timestamp:

Mar 27, 2019, 4:09:51 PM (7 years ago)

Author:

aestes@apple.com

Message:

REGRESSION (r242686): package-root creates roots with broken symlinks in WebKit.framework/XPCServices/
​https://bugs.webkit.org/show_bug.cgi?id=196317

Reviewed by Dan Bernstein.

Source/WebKit:

Removed some remnants of the Storage Process.

• Configurations/BaseTarget.xcconfig:
• Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb: Removed.
• WebKit.xcodeproj/project.pbxproj:

Tools:

package-root copies built products into a staging directory using ditto(1), which does not
follow symbolic links as it traverses a directory. Now that the files in
WebKit.framework/XPCServices/ are symbolic links to a location outside of the framework
itself, these become broken links when ditto'd into the staging directory.

To account for this, change package-root to copy using cp(1) in a mode that follows symlinks.

• Scripts/package-root:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Configurations/BaseTarget.xcconfig (modified) (1 diff)
• Source/WebKit/Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb (deleted)
• Source/WebKit/WebKit.xcodeproj/project.pbxproj (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/package-root (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-27  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r242686): package-root creates roots with broken symlinks in WebKit.framework/XPCServices/
+        https://bugs.webkit.org/show_bug.cgi?id=196317
+
+        Reviewed by Dan Bernstein.
+
+        Removed some remnants of the Storage Process.
+
+        * Configurations/BaseTarget.xcconfig:
+        * Resources/SandboxProfiles/ios/com.apple.WebKit.Storage.sb: Removed.
+        * WebKit.xcodeproj/project.pbxproj:
+
 2019-03-27  Keith Rollin  <krollin@apple.com>
 

trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

@@ -112 +112 @@
 WK_CORE_PREDICTION_DEFINES = $(WK_CORE_PREDICTION_DEFINES_$(WK_HAVE_CORE_PREDICTION));
 WK_CORE_PREDICTION_DEFINES_YES = HAVE_CORE_PREDICTION;
-
-WK_STORAGE_SERVICE_PRODUCT_NAME = $(WK_STORAGE_SERVICE_PRODUCT_NAME_$(WK_USE_LEGACY_STORAGE_SERVICE_NAME));
-WK_STORAGE_SERVICE_PRODUCT_NAME_ = $(WK_STORAGE_SERVICE_PRODUCT_NAME_NO);
-WK_STORAGE_SERVICE_PRODUCT_NAME_NO = com.apple.WebKit.Storage;
-WK_STORAGE_SERVICE_PRODUCT_NAME_YES = com.apple.WebKit.Databases;
-
-WK_USE_LEGACY_STORAGE_SERVICE_NAME[sdk=iphoneos11*] = $(WK_USE_LEGACY_STORAGE_SERVICE_NAME_11$(IPHONEOS_DEPLOYMENT_TARGET:suffix:identifier));
-WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_0 = YES;
-WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_1 = YES;
-WK_USE_LEGACY_STORAGE_SERVICE_NAME_11_2 = YES;

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -3959 +3959 @@
                 A5EFD38B16B0E88C00B2F0E8 /* WKPageVisibilityTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageVisibilityTypes.h; sourceTree = "<group>"; };
                 A72D5D7F1236CBA800A88B15 /* APISerializedScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISerializedScriptValue.h; sourceTree = "<group>"; };
-                A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Storage.sb; sourceTree = "<group>"; };
                 A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.Networking.sb; sourceTree = "<group>"; };
                 A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */ = {isa = PBXFileReference; lastKnownFileType = text; path = com.apple.WebKit.WebContent.sb; sourceTree = "<group>"; };
@@ -7220 +7219 @@
                         children = (
                                 A78CCDD8193AC9E3005ECC25 /* com.apple.WebKit.Networking.sb */,
-                                A78CCDD7193AC9E3005ECC25 /* com.apple.WebKit.Storage.sb */,
                                 A78CCDD9193AC9E3005ECC25 /* com.apple.WebKit.WebContent.sb */,
                         );
@@ -10738 +10736 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n    exit\nfi\n\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\n    BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../..\"\nelse\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\n    BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../../../..\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\" \"${XPC_SERVICES_PATH}/${WK_STORAGE_SERVICE_PRODUCT_NAME}.xpc\"\n\nif [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n    ln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
+                        shellScript = "if [[ \"${CONFIGURATION}\" == \"Production\" ]]; then\n    exit\nfi\n\nif [[ ${WK_PLATFORM_NAME} != \"macosx\" ]]; then\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/XPCServices\"\n    BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../..\"\nelse\n    XPC_SERVICES_PATH=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/Versions/A/XPCServices\"\n    BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES=\"../../../..\"\nfi\n\nmkdir -p \"${XPC_SERVICES_PATH}\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.WebContent.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.WebContent.xpc\"\nln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Networking.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Networking.xpc\"\n\nif [[ ${WK_PLATFORM_NAME} == macosx ]]; then\n    ln -sFh \"${BUILT_PRODUCTS_DIR_RELATIVE_PATH_FROM_XPC_SERVICES}/com.apple.WebKit.Plugin.64.xpc\" \"${XPC_SERVICES_PATH}/com.apple.WebKit.Plugin.64.xpc\"\nfi\n";
                 };
                 99CA3862207286DB00BAD578 /* Copy WebDriver Atoms to Framework Private Headers */ = {

trunk/Tools/ChangeLog

@@ +1 @@
+2019-03-27  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r242686): package-root creates roots with broken symlinks in WebKit.framework/XPCServices/
+        https://bugs.webkit.org/show_bug.cgi?id=196317
+
+        Reviewed by Dan Bernstein.
+
+        package-root copies built products into a staging directory using ditto(1), which does not
+        follow symbolic links as it traverses a directory. Now that the files in
+        WebKit.framework/XPCServices/ are symbolic links to a location outside of the framework
+        itself, these become broken links when ditto'd into the staging directory.
+
+        To account for this, change package-root to copy using cp(1) in a mode that follows symlinks.
+
+        * Scripts/package-root:
+
 2019-03-27  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/package-root

@@ -81 +81 @@
 my $productDir = productDir();
 my $stagingRoot = tempdir(CLEANUP => 1);
-my $stagingPrivatePath = "/$stagingRoot$privateInstallPath";
-my $stagingPublicPath = "/$stagingRoot/$publicInstallPath";
+my $stagingPrivatePath = "$stagingRoot$privateInstallPath";
+my $stagingPublicPath = "$stagingRoot$publicInstallPath";
 my $archiveName = "webkit-$configuration-$platform";
 my $archivePath = "$productDir/$archiveName.tar.gz";
 my ($fh, $tempArchiveName) = tempfile( "/tmp/$archiveName-XXXXXXX");
 
+system 'mkdir', '-p', $stagingPrivatePath;
+system 'mkdir', '-p', $stagingPublicPath;
+
 foreach my $framework (@privateFrameworks) {
     print "Copying Private $framework from $productDir ...\n";
-    system 'ditto', $productDir . "/$framework.framework/", "$stagingPrivatePath/$framework.framework/";
+    system 'cp', '-LpR', $productDir . "/$framework.framework", "$stagingPrivatePath/";
     die "Check to see that you have built $framework for $configuration-$platform" if $? and $framework ne 'WebKit2';
 }
@@ -95 +98 @@
 foreach my $framework (@publicFrameworks) {
     print "Copying Public $framework from $productDir ...\n";
-    system 'ditto', $productDir . "/$framework.framework/", "$stagingPublicPath/$framework.framework/";
+    system 'cp', '-LpR', $productDir . "/$framework.framework", "$stagingPublicPath/";
     die "Check to see that you have built $framework for $configuration-$platform" if $?;
 }