diff --git a/llvm/utils/release/export.sh b/llvm/utils/release/export.sh --- a/llvm/utils/release/export.sh +++ b/llvm/utils/release/export.sh @@ -13,7 +13,7 @@ set -e -projects="llvm clang compiler-rt libcxx libcxxabi libclc clang-tools-extra polly lldb lld openmp libunwind flang" +projects="llvm clang cmake compiler-rt libcxx libcxxabi libclc clang-tools-extra polly lldb lld openmp libunwind flang" release="" rc="" @@ -128,21 +128,10 @@ -cJf test-suite-$release$rc.src.tar.xz test-suite-$release$rc.src fi - # Package up top-level cmake directory so that we can append it to all projects. - tmp_dir=$(mktemp -d) - cmake_archive_file=$tmp_dir/cmake.tar - trap "rm -rv $tmp_dir" EXIT - pushd $llvm_src_dir - git archive -o $cmake_archive_file $tree_id cmake/ - popd - for proj in $projects; do echo "Creating tarball for $proj ..." pushd $llvm_src_dir/$proj - tmp_archive_file=$tmp_dir/$proj.tar - git archive --prefix=$proj-$release$rc.src/ -o $tmp_archive_file $tree_id . - tar -Af $tmp_archive_file $cmake_archive_file - xz < $tmp_archive_file > $target_dir/$(template_file $proj) + git archive --prefix=$proj-$release$rc.src/ $tree_id . | xz >$target_dir/$(template_file $proj) popd done }