Attachment 368753 Details for Bug 197487 – Patch

[patch] Patch

bug-197487-20190501195257.patch (text/plain), 4.55 KB, created by Wenson Hsieh on 2019-05-01 19:52:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2019-05-01 19:52:58 PDT

Size: 4.55 KB

patch

obsolete

>Subversion Revision: 244854
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1df7f99a6fcd250bf7e71e12142725391433b181..7102eedf406c16e0a4ecacd5a4562a1c980b9d97 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,19 @@
>+2019-05-01  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        Add the ability to import WebKitAdditions snippets in WebKit.apinotes
>+        https://bugs.webkit.org/show_bug.cgi?id=197487
>+        <rdar://problem/50389085>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/API/Cocoa/WebKit.apinotes: Import a new WebKitAdditions file.
>+
>+        * WebKit.xcodeproj/project.pbxproj: Check all files in Headers/ and PrivateHeaders/ that need replacement, not
>+        simply anything ending with ".h".
>+
>+        * mac/replace-webkit-additions-includes.py:
>+        (main): Teach the replacement script to handle files in Headers/ or PrivateHeaders/ that don't end in ".h".
>+
> 2019-05-01  Alex Christensen  <achristensen@webkit.org>
> 
>         Protect against null crash in fetchDiskCacheEntries
>diff --git a/Source/WebKit/Shared/API/Cocoa/WebKit.apinotes b/Source/WebKit/Shared/API/Cocoa/WebKit.apinotes
>index d711df45068146f247c22478cef42f68768c8eea..3efc93912e9228409ab6f21d804cd4d73e97e367 100644
>--- a/Source/WebKit/Shared/API/Cocoa/WebKit.apinotes
>+++ b/Source/WebKit/Shared/API/Cocoa/WebKit.apinotes
>@@ -200,3 +200,6 @@ Classes:
> Tags:
> - Name: WKErrorCode
>   NSErrorDomain: WKErrorDomain
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/WebKitAdditions.apinotes>
>+#endif
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index 796ec89751c56633743f481dd7f82d7e78333b76..37879b54ac6301c485e20d4de4eeff58f3a609a4 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -10908,7 +10908,7 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 			shellPath = /bin/sh;
>-			shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -ge \"1100\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n    # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\n    exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    for HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\n        for HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.h; do\n            if [[ ! -z `grep '#import <WebKitAdditions/.*\\.h>' \"${HEADER_PATH}\"` ]]; then\n                python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"${HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n            fi\n        done\n    done\nfi\n";
>+			shellScript = "if [ \"${XCODE_VERSION_MAJOR}\" -ge \"1100\" -a \"${USE_NEW_BUILD_SYSTEM}\" = \"YES\" ]; then\n    # In this configuration, post-processing is performed at the same time as copying in the postprocess-header-rule script, so there's no need for this separate step.\n    exit 0\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" -o \"${ACTION}\" = \"installapi\" ]; then\n    for HEADERS_DIRECTORY in \"${PUBLIC_HEADERS_FOLDER_PATH}\" \"${PRIVATE_HEADERS_FOLDER_PATH}\"; do\n        for HEADER_PATH in \"${TARGET_BUILD_DIR}/${HEADERS_DIRECTORY}/\"*.*; do\n            if [[ ! -z `grep '#import <WebKitAdditions/.*>' \"${HEADER_PATH}\"` ]]; then\n                python \"${SRCROOT}/mac/replace-webkit-additions-includes.py\" \"${HEADER_PATH}\" \"${BUILT_PRODUCTS_DIR}\" \"${SDKROOT}\" || exit $?\n            fi\n        done\n    done\nfi\n\n\n";
> 		};
> /* End PBXShellScriptBuildPhase section */
> 
>diff --git a/Source/WebKit/mac/replace-webkit-additions-includes.py b/Source/WebKit/mac/replace-webkit-additions-includes.py
>index d79e628b18c11f9bad053c76f5bed48082408d77..ed339c551a5728ad3360dbfc349203d5b10bb1de 100755
>--- a/Source/WebKit/mac/replace-webkit-additions-includes.py
>+++ b/Source/WebKit/mac/replace-webkit-additions-includes.py
>@@ -65,7 +65,7 @@ def main(argv=None):
>         print("(%s): SDK root directory unspecified" % argv[0])
>         return 1
> 
>-    additions_import_pattern = re.compile(r"\#if USE$APPLE_INTERNAL_SDK$\n#import <WebKitAdditions/(.*\.h)>\n#endif")
>+    additions_import_pattern = re.compile(r"\#if USE$APPLE_INTERNAL_SDK$\n#import <WebKitAdditions/(.*)>\n#endif")
>     try:
>         with open(header_path, "r") as header:
>             header_contents = header.read()

Actions: View | Formatted Diff | Diff

Attachments on bug 197487: 368753