Title: [234972] trunk/Source/WebKit
- Revision
- 234972
- Author
- commit-qu...@webkit.org
- Date
- 2018-08-16 16:55:25 -0700 (Thu, 16 Aug 2018)
Log Message
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
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234971 => 234972)
--- trunk/Source/WebKit/ChangeLog 2018-08-16 23:50:37 UTC (rev 234971)
+++ trunk/Source/WebKit/ChangeLog 2018-08-16 23:55:25 UTC (rev 234972)
@@ -1,3 +1,17 @@
+2018-08-16 Commit Queue <commit-qu...@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_...@apple.com>
Remove unused parentProcessName from NetworkProcessCreationParameters
Deleted: trunk/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh (234971 => 234972)
--- trunk/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh 2018-08-16 23:50:37 UTC (rev 234971)
+++ trunk/Source/WebKit/Scripts/copy-webcontent-resources-to-private-headers.sh 2018-08-16 23:55:25 UTC (rev 234972)
@@ -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
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (234971 => 234972)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-08-16 23:50:37 UTC (rev 234971)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-08-16 23:55:25 UTC (rev 234972)
@@ -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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
