Title: [289584] trunk
- Revision
- 289584
- Author
- e...@apple.com
- Date
- 2022-02-10 15:07:18 -0800 (Thu, 10 Feb 2022)
Log Message
Use of unversioned 'python' in Mac builds causing failures in 12.3
https://bugs.webkit.org/show_bug.cgi?id=236327
Reviewed by Jonathan Bedard.
* WebKit.xcodeproj/project.pbxproj: python -> python3 in "Replace WebKitAdditions in
Framework Headers" phase.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (289583 => 289584)
--- trunk/Source/WebKit/ChangeLog 2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Source/WebKit/ChangeLog 2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,3 +1,13 @@
+2022-02-10 Elliott Williams <e...@apple.com>
+
+ Use of unversioned 'python' in Mac builds causing failures in 12.3
+ https://bugs.webkit.org/show_bug.cgi?id=236327
+
+ Reviewed by Jonathan Bedard.
+
+ * WebKit.xcodeproj/project.pbxproj: python -> python3 in "Replace WebKitAdditions in
+ Framework Headers" phase.
+
2022-02-10 Kimmo Kinnunen <kkinnu...@apple.com>
ImageBuffer::get/putPixelBuffer should not go through DisplayList
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (289583 => 289584)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2022-02-10 23:07:18 UTC (rev 289584)
@@ -15473,7 +15473,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_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}\" = \"analyze\" -o \"${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";
+ shellScript = "if [ \"${XCODE_VERSION_ACTUAL}\" -ge \"1140\" -a \"${WK_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}\" = \"analyze\" -o \"${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 python3 \"${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 */
Modified: trunk/Tools/Scripts/extract-dependencies-from-makefile (289583 => 289584)
--- trunk/Tools/Scripts/extract-dependencies-from-makefile 2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Tools/Scripts/extract-dependencies-from-makefile 2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# vim: set ft=python:
# -*- coding: utf-8 -*-
#
Modified: trunk/Tools/Scripts/generate-xcfilelists (289583 => 289584)
--- trunk/Tools/Scripts/generate-xcfilelists 2022-02-10 23:02:57 UTC (rev 289583)
+++ trunk/Tools/Scripts/generate-xcfilelists 2022-02-10 23:07:18 UTC (rev 289584)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# Copyright (C) 2019 Apple Inc. All rights reserved.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
