Title: [284074] trunk/Source/ThirdParty
- Revision
- 284074
- Author
- [email protected]
- Date
- 2021-10-12 18:23:47 -0700 (Tue, 12 Oct 2021)
Log Message
Invoke ThirdParty build scripts with python3 explicitly
https://bugs.webkit.org/show_bug.cgi?id=231605
Reviewed by Dean Jackson.
Source/ThirdParty/ANGLE:
* ANGLE.xcodeproj/project.pbxproj:
* adjust-angle-include-paths.py:
* src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py:
Source/ThirdParty/libwebrtc:
* Source/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj (284073 => 284074)
--- trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.xcodeproj/project.pbxproj 2021-10-13 01:23:47 UTC (rev 284074)
@@ -3576,7 +3576,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [ \"${ACTION}\" = \"analyze\" ] || [ \"${ACTION}\" = \"build\" ] || [ \"${ACTION}\" = \"install\" ]; then\n echo python \"${SRCROOT}/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py\" \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\n python \"${SRCROOT}/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py\" \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n";
+ shellScript = "if [ \"${ACTION}\" = \"analyze\" ] || [ \"${ACTION}\" = \"build\" ] || [ \"${ACTION}\" = \"install\" ]; then\n echo python3 \"${SRCROOT}/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py\" \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\n python3 \"${SRCROOT}/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py\" \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (284073 => 284074)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2021-10-13 01:23:47 UTC (rev 284074)
@@ -1,3 +1,14 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke ThirdParty build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231605
+
+ Reviewed by Dean Jackson.
+
+ * ANGLE.xcodeproj/project.pbxproj:
+ * adjust-angle-include-paths.py:
+ * src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py:
+
2021-10-06 Kyle Piddington <[email protected]>
Shadertoy "truchet district" fails to compile with error: Internal error compiling shader with Metal backend"
Modified: trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.py (284073 => 284074)
--- trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.py 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/ANGLE/adjust-angle-include-paths.py 2021-10-13 01:23:47 UTC (rev 284074)
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/python3
# WebKit builds ANGLE as a static library, and exports some of the
# internal header files as "public headers" in the Xcode project for
Modified: trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py (284073 => 284074)
--- trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/shaders/create_mtl_internal_shaders.py 2021-10-13 01:23:47 UTC (rev 284074)
@@ -33,7 +33,7 @@
string += 'constexpr uint8_t {0}[]={{\n'.format(variable_name)
bytes_ = open(filename, "rb").read()
for byte in bytes_:
- string += '0x{:02x}'.format(ord(byte)) + ", "
+ string += '0x{:02x}'.format(byte) + ", "
string += "\n};\n"
with open(dest_src_file, "a") as out_file:
out_file.write(string)
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (284073 => 284074)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2021-10-13 01:23:47 UTC (rev 284074)
@@ -1,3 +1,12 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke ThirdParty build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231605
+
+ Reviewed by Dean Jackson.
+
+ * Source/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj:
+
2021-10-06 Youenn Fablet <[email protected]>
ObjectiveC WebRTC frame buffers are autoreleased late, especially on Debug builds
Modified: trunk/Source/ThirdParty/libwebrtc/Source/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj (284073 => 284074)
--- trunk/Source/ThirdParty/libwebrtc/Source/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj 2021-10-13 01:10:43 UTC (rev 284073)
+++ trunk/Source/ThirdParty/libwebrtc/Source/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj 2021-10-13 01:23:47 UTC (rev 284074)
@@ -697,7 +697,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/usr/bin/python Scripts/versiongenerate.py ../ $PROJECT_TEMP_DIR";
+ shellScript = "# Remember, this \"Run Script\" build phase will be executed from $SRCROOT\n/usr/bin/python3 Scripts/versiongenerate.py ../ $PROJECT_TEMP_DIR";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
