From 4ef0186487aec63484c99845b8608278d224fb9c Mon Sep 17 00:00:00 2001 From: Lyupa Anastasia Date: Mon, 20 Feb 2023 18:07:23 +0300 Subject: [PATCH 1/2] [BUILD] Add manifest.xml into release packages Signed-off-by: Lyupa Anastasia --- llvm-build/build.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/llvm-build/build.py b/llvm-build/build.py index 9df15f4f4921..567084402e7d 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -1960,6 +1960,16 @@ class LlvmPackage(BuildUtils): shutil.copyfile(os.path.join(self.build_config.LLVM_BUILD_DIR, "toolchain_readme.md"), os.path.join(install_dir, "README.md")) + # Generate manifest in install_dir + manifest = os.path.join(install_dir, 'manifest.xml') + repo_tool = os.path.join(self.build_config.REPOROOT_DIR, '.repo', 'repo', 'repo') + if os.path.isfile(repo_tool): + self.logger().info('Generating manifest.') + subprocess.run([repo_tool, 'manifest', '-r', '-o', manifest], shell=False, + stdout=subprocess.PIPE, cwd=self.build_config.REPOROOT_DIR) + else: + self.logger().error('Cannot generate manifest, repo tool not found.') + # Remove unnecessary binaries. necessary_bin_files = [] self.package_clang_bin_file(necessary_bin_files, ext) -- Gitee From 7d0174e7296c9a13452fa4c55433745dd8c900a6 Mon Sep 17 00:00:00 2001 From: Lyupa Anastasia Date: Tue, 21 Feb 2023 12:31:33 +0300 Subject: [PATCH 2/2] [BUILD] Use python3 by default for build.py Signed-off-by: Lyupa Anastasia --- llvm-build/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm-build/build.py b/llvm-build/build.py index 567084402e7d..4f0800422a9d 100755 --- a/llvm-build/build.py +++ b/llvm-build/build.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2021 Huawei Device Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); -- Gitee