Attachment 347228 Details for Bug 188601 – Patch

[patch] Patch

bug-188601-20180815171547.patch (text/plain), 4.43 KB, created by Ben Richards on 2018-08-15 17:15:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Richards

Created: 2018-08-15 17:15:48 PDT

Size: 4.43 KB

patch

obsolete

>Subversion Revision: 234891
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 65b78a253c9de6d06d570c6bdfef158d67ac774b..b2ec30270f2a7563e5c8bad136b25e0d4364ad18 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-15  Ben Richards  <benton_richards@apple.com>
>+
>+        Add script to generate WebContent service resource files
>+        https://bugs.webkit.org/show_bug.cgi?id=188601
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added new build phase to WebContent service to copy resource files to WebKit.framework/PrivateHeaders
>+
>+        * WebKit.xcodeproj/project.pbxproj:
>+
> 2018-08-15  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] WaylandCompositor fails to properly remove surface from its page map
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index c833c1fee5b333a6a57a1f213946975309605754..60f2f75952cc3a4e2eaf73965dffcfe25d37fdcb 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -10142,6 +10142,7 @@
> 				BCDC308D15FDB99A006B6695 /* Frameworks */,
> 				BC3DE46415A91763008D26FC /* Resources */,
> 				7AFCBD5420B8911D00F55C9C /* Process WebContent entitlements */,
>+				4100AB9E2124E55C009D09E4 /* Copy Resources to Framework Private Headers */,
> 			);
> 			buildRules = (
> 			);
>@@ -10419,7 +10420,7 @@
> 			name = "Copy Additional Resources";
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>-			shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nSOURCE_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nif [[ ! -d \"$SOURCE_PATH\" ]]; then\n    SOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nfi\n\nif [[ -d \"$SOURCE_PATH\" ]]; then\n    ditto $SOURCE_PATH \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"\nfi";
>+			shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nSOURCE_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nif [[ ! -d \"$SOURCE_PATH\" ]]; then\n    SOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nfi\n\nif [[ -d \"$SOURCE_PATH\" ]]; then\n    ditto $SOURCE_PATH \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"\nfi\n";
> 		};
> 		3713F0231429063D0036387F /* Check For Inappropriate Objective-C Class Names */ = {
> 			isa = PBXShellScriptBuildPhase;
>@@ -10492,6 +10493,27 @@
> 			shellPath = /bin/sh;
> 			shellScript = "if [[ \"${WK_MANUAL_SANDBOXING_ENABLED}\" != \"YES\" || \"${WK_PLATFORM_NAME}\" == \"macosx\" || \"${WK_PLATFORM_NAME}\" == \"iosmac\" ]]; then\n    exit\nfi\n\nif [[ \"${ACTION}\" == \"build\" || \"${ACTION}\" == \"install\" ]]; then\n    for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n        eval SANDBOX_PROFILE=\\${SCRIPT_INPUT_FILE_${i}}\n        ditto \"${SANDBOX_PROFILE}\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/${SANDBOX_PROFILE##*/}\"\n    done\nfi\n";
> 		};
>+		4100AB9E2124E55C009D09E4 /* Copy Resources to Framework Private Headers */ = {
>+			isa = PBXShellScriptBuildPhase;
>+			buildActionMask = 2147483647;
>+			files = (
>+			);
>+			inputFileListPaths = (
>+			);
>+			inputPaths = (
>+				"$(TEMP_FILE_DIR)/$(FULL_PRODUCT_NAME).xcent",
>+				"$(SRCROOT)/Resources/WebContentProcess.xib",
>+				"$(SRCROOT)/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist",
>+			);
>+			name = "Copy Resources to Framework Private Headers";
>+			outputFileListPaths = (
>+			);
>+			outputPaths = (
>+			);
>+			runOnlyForDeploymentPostprocessing = 0;
>+			shellPath = /bin/sh;
>+			shellScript = "DST_DIR=\"${BUILT_PRODUCTS_DIR}/WebKit.framework/PrivateHeaders/WebContentResources\"\nmkdir -p \"$DST_DIR\"\n\necho \"${DST_DIR}\" > ~/Desktop/dir.txt\n\nfor ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do\n    eval WEBCONTENT_RESOURCE=\\${SCRIPT_INPUT_FILE_${i}}\n    ditto \"${WEBCONTENT_RESOURCE}\" \"${DST_DIR}/${WEBCONTENT_RESOURCE##*/}\"\ndone\n\n";
>+		};
> 		5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
> 			isa = PBXShellScriptBuildPhase;
> 			buildActionMask = 2147483647;
>@@ -10616,7 +10638,7 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>-			shellScript = "Scripts/process-webcontent-or-plugin-entitlements.sh\n";
>+			shellScript = "Scripts/process-webcontent-or-plugin-entitlements.sh\n\n";
> 		};
> 		7AFCBD5520B8917D00F55C9C /* Process WebContent entitlements */ = {
> 			isa = PBXShellScriptBuildPhase;

Actions: View | Formatted Diff | Diff

Attachments on bug 188601: 347162 | 347166 | 347178 | 347228 | 347285 | 347297 | 347371 | 347405 | 347418 | 349958 | 350038 | 350047