Maintenance #13

Merged
rboullard merged 52 commits from Development into main 2026-04-16 22:19:29 +00:00
2 changed files with 26 additions and 1 deletions
Showing only changes of commit 280220a157 - Show all commits

View File

@@ -19,7 +19,7 @@ patches:
- patch_file: "patches/2025.3/use-conan-dependencies.patch"
patch_description: "Replace third_party with Conan dependencies"
patch_type: "conan"
- patch_file: "patches/2021.1/adapt-update_build_version.py.patch"
- patch_file: "patches/2026.1/adapt-update_build_version.py.patch"
patch_description: "Adapt update_build_version.py for Conan"
patch_type: "conan"
- patch_file: "patches/2021.1/install-shaderc_util.patch"

View File

@@ -0,0 +1,25 @@
diff --git a/utils/update_build_version.py b/utils/update_build_version.py
--- a/utils/update_build_version.py
+++ b/utils/update_build_version.py
@@ -130,18 +130,18 @@
def main():
- if len(sys.argv) != 5:
+ if len(sys.argv) < 5:
print(('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.format(
sys.argv[0])))
sys.exit(1)
- projects = ['shaderc', 'spirv-tools', 'glslang']
+ projects = ['shaderc']
new_content = ''.join([
'"{}\\n"\n'.format(get_version_string(p, d))
for (p, d) in zip(projects, sys.argv[1:])
])
- output_file = sys.argv[4]
+ output_file = sys.argv[-1]
mkdir_p(os.path.dirname(output_file))
if os.path.isfile(output_file):