[llvm] c0f5bee - [release] Add cmake as an extra tarball and not bundle it

[Konrad Kleine via llvm-commits]

Author: Konrad Kleine
Date: 2022-05-19T11:12:54+02:00
New Revision: c0f5beef2fb19c0444d14b96decdf6e13d7a0917

URL: https://github.com/llvm/llvm-project/commit/c0f5beef2fb19c0444d14b96decdf6e13d7a0917
DIFF: https://github.com/llvm/llvm-project/commit/c0f5beef2fb19c0444d14b96decdf6e13d7a0917.diff

LOG: [release] Add cmake as an extra tarball and not bundle it

Revert "Add cmake/ to release tarballs via concatenation"

This reverts commit 3a33664e8838e8b77acd1bbb13b1cf5e580a1077.

Revert "Add cmake to source release tarballs"

This reverts commit 32a0482a65b86cf0d84ea7e784cca9852df5c67c.

Reviewed By: tstellar, aaronpuchert

Differential Revision: https://reviews.llvm.org/D125798

Added: 
    

Modified: 
    llvm/utils/release/export.sh

Removed: 
    


################################################################################
diff  --git a/llvm/utils/release/export.sh b/llvm/utils/release/export.sh
index 55e38ab12bc7..223c0f3ccfde 100755
--- 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 @@ export_sources() {
             -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
 }