Attachment 347323 Details for Bug 188683 – ROLLOUT of r234958

[patch] ROLLOUT of r234958

bug-188683-20180816195229.patch (text/plain), 5.93 KB, created by WebKit Commit Bot on 2018-08-16 16:52:29 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-08-16 16:52:29 PDT

Size: 5.93 KB

patch

obsolete

>Subversion Revision: 234971
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 95ee5af31ae12f636a72646bc09fe634950f7406..c24d48bc6cba2304b420faf873f3c549ae140c57 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2018-08-16  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r234958.
>+        https://bugs.webkit.org/show_bug.cgi?id=188683
>+
>+        Breaking builds due to copy failure (Requested by brichards on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "Add script to generate WebContent service resource files"
>+        https://bugs.webkit.org/show_bug.cgi?id=188601
>+        https://trac.webkit.org/changeset/234958
>+
> 2018-08-16  Sihui Liu  <sihui_liu@apple.com>
> 
>         Remove unused parentProcessName from NetworkProcessCreationParameters
>diff --git a/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh b/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh
>deleted file mode 100755
>index de2d96189d7d3fe97a0874b53837a27a23d23541..0000000000000000000000000000000000000000
>--- a/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh
>+++ /dev/null
>@@ -1,31 +0,0 @@
>-#!/bin/sh
>-set -e
>-
>-WEB_CONTENT_RESOURCES_PATH="${BUILT_PRODUCTS_DIR}/WebKit.framework/PrivateHeaders/CustomWebContentResources"
>-mkdir -p "${WEB_CONTENT_RESOURCES_PATH}"
>-
>-echo "Copying WebContent entitlements to ${WEB_CONTENT_RESOURCES_PATH}"
>-ENTITLEMENTS_FILE="${TEMP_FILE_DIR}/${FULL_PRODUCT_NAME}.xcent"
>-ditto "${ENTITLEMENTS_FILE}" "${WEB_CONTENT_RESOURCES_PATH}/WebContent.entitlements"
>-
>-echo "Copying WebContentProcess.xib to ${WEB_CONTENT_RESOURCES_PATH}"
>-WEBCONTENT_XIB="${SRCROOT}/Resources/WebContentProcess.xib"
>-ditto "${WEBCONTENT_XIB}" "${WEB_CONTENT_RESOURCES_PATH}/WebContentProcess.xib"
>-
>-echo "Copying Info.plist to ${WEB_CONTENT_RESOURCES_PATH}"
>-PROCESSED_INFOPLIST="${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}"
>-UNPROCESSED_INFOPLIST="${INFOPLIST_FILE}"
>-COPIED_INFOPLIST="${WEB_CONTENT_RESOURCES_PATH}/Info.plist"
>-ditto "${UNPROCESSED_INFOPLIST}" "${COPIED_INFOPLIST}"
>-
>-echo "Setting fixed entry values for ${COPIED_INFOPLIST}"
>-if [[ ${WK_PLATFORM_NAME} == "macosx" ]]; then
>-    FIXED_ENTRIES=( ":XPCService:RunLoopType" )
>-else
>-    FIXED_ENTRIES=()
>-fi
>-
>-for ((i = 0; i < ${#FIXED_ENTRIES[@]}; ++i)); do
>-    ENTRY_VALUE=$(/usr/libexec/PlistBuddy -c "Print ${FIXED_ENTRIES[$i]}" "${PROCESSED_INFOPLIST}")
>-    /usr/libexec/PlistBuddy -c "Set ${FIXED_ENTRIES[$i]} ${ENTRY_VALUE}" "${COPIED_INFOPLIST}"
>-done
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 5d9682125a61f8c6835cf9c08cf6a6923ae5bbf1..0a71d539874cb7693adfcfcb2a711553bbdbe183 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -3445,7 +3445,6 @@
> 		4135FBCF1F4FB7F20074C47B /* CacheStorageEngineCaches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheStorageEngineCaches.cpp; sourceTree = "<group>"; };
> 		4135FBD01F4FB7F20074C47B /* CacheStorageEngineCaches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheStorageEngineCaches.h; sourceTree = "<group>"; };
> 		413CCD4F20DEBC2F0065A21A /* com.google.googletalkbrowserplugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.google.googletalkbrowserplugin.sb; sourceTree = "<group>"; };
>-		413E67632125E75400C0F09E /* copy-webcontent-resources-to-private-headers.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "copy-webcontent-resources-to-private-headers.sh"; sourceTree = "<group>"; };
> 		4143751B20EAEA1E00FAD06C /* cn.microdone.cmb.safari.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cn.microdone.cmb.safari.sb; sourceTree = "<group>"; };
> 		414DD37820BF43EA006959FB /* com.cisco.webex.plugin.gpc64.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.cisco.webex.plugin.gpc64.sb; sourceTree = "<group>"; };
> 		414DEDD51F9EDDDF0047C40D /* ServiceWorkerProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerProcessProxy.h; sourceTree = "<group>"; };
>@@ -8677,7 +8676,6 @@
> 			children = (
> 				7CDE73A21F9DA59700390312 /* PreferencesTemplates */,
> 				0FC0856E187CE0A900780D86 /* __init__.py */,
>-				413E67632125E75400C0F09E /* copy-webcontent-resources-to-private-headers.sh */,
> 				C0CE73361247F70E00BC0EC4 /* generate-message-receiver.py */,
> 				C0CE73371247F70E00BC0EC4 /* generate-messages-header.py */,
> 				7CDE73A11F9DA41400390312 /* GeneratePreferences.rb */,
>@@ -10170,7 +10168,6 @@
> 				BCDC308D15FDB99A006B6695 /* Frameworks */,
> 				BC3DE46415A91763008D26FC /* Resources */,
> 				7AFCBD5420B8911D00F55C9C /* Process WebContent entitlements */,
>-				413E67622125E6E800C0F09E /* Copy Custom WebContent Resources to Framework Private Headers */,
> 			);
> 			buildRules = (
> 			);
>@@ -10567,27 +10564,6 @@
> 			shellPath = /bin/sh;
> 			shellScript = "Scripts/process-network-sandbox-entitlements.sh\n";
> 		};
>-		413E67622125E6E800C0F09E /* Copy Custom WebContent Resources to Framework Private Headers */ = {
>-			isa = PBXShellScriptBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-			);
>-			inputFileListPaths = (
>-			);
>-			inputPaths = (
>-				"$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).xcent",
>-				"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
>-				"$(SRCROOT)/Resources/WebContentProcess.xib",
>-			);
>-			name = "Copy Custom WebContent Resources to Framework Private Headers";
>-			outputFileListPaths = (
>-			);
>-			outputPaths = (
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-			shellPath = /bin/sh;
>-			shellScript = "Scripts/copy-webcontent-resources-to-private-headers.sh\n";
>-		};
> 		5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
> 			isa = PBXShellScriptBuildPhase;
> 			buildActionMask = 2147483647;

Actions: View | Formatted Diff | Diff

Attachments on bug 188683: 347323