From d2e36cbb689db3199dade1182ccb60156c1da66e Mon Sep 17 00:00:00 2001 From: Maxim Kuvyrkov Date: Tue, 7 Sep 2021 08:23:58 +0000 Subject: tcwg-llvm-release.bat: Fix path to the toolchain package Change-Id: I3b358f51e52c458011f1fc679140ef93c62e9b8f --- build_llvm_package.bat | 3 ++- tcwg-llvm-release.bat | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build_llvm_package.bat b/build_llvm_package.bat index 1b265bca..b7c8df8b 100755 --- a/build_llvm_package.bat +++ b/build_llvm_package.bat @@ -30,10 +30,11 @@ set revision=%1 if "%2" == "test" ( set git_ref=%revision% + set package_version=%revision:~0,8% ) else ( set git_ref=llvmorg-%revision% + set package_version=%revision% ) -set package_version=%revision:~0,8% set clang_format_vs_version=13.0.0.%datestamp% set build_dir=llvm_package_%package_version% diff --git a/tcwg-llvm-release.bat b/tcwg-llvm-release.bat index 47e89fa9..3924be99 100755 --- a/tcwg-llvm-release.bat +++ b/tcwg-llvm-release.bat @@ -8,5 +8,15 @@ REM llvm/utils/release/build_llvm_package.bat script. call jenkins-scripts\build_llvm_package.bat %1 %2 || exit /b set revision=%1 -set package_version=%revision:~0,8% -cp LLVM-%package_version%-woa64.zip artifacts\ + +if "%2" == "test" ( + set git_ref=%revision% + set package_version=%revision:~0,8% +) else ( + set git_ref=llvmorg-%revision% + set package_version=%revision% +) +set clang_format_vs_version=13.0.0.%datestamp% +set build_dir=llvm_package_%package_version% + +cp %build_dir%/build32/LLVM-%package_version%-woa64.zip artifacts\ -- cgit v1.2.3