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

[Konrad Wilhelm Kleine via Phabricator via llvm-commits]

kwk created this revision.
kwk added a reviewer: tstellar.
Herald added a reviewer: sscalpone.
Herald added a project: All.
kwk requested review of this revision.
Herald added a reviewer: jdoerfert.
Herald added subscribers: llvm-commits, sstefan1.
Herald added a project: LLVM.

Revert "Add cmake/ to release tarballs via concatenation"

This reverts commit 3a33664e8838e8b77acd1bbb13b1cf5e580a1077 <https://reviews.llvm.org/rG3a33664e8838e8b77acd1bbb13b1cf5e580a1077>.

Revert "Add cmake to source release tarballs"

This reverts commit 32a0482a65b86cf0d84ea7e784cca9852df5c67c <https://reviews.llvm.org/rG32a0482a65b86cf0d84ea7e784cca9852df5c67c>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D125798

Files:
  llvm/utils/release/export.sh


Index: llvm/utils/release/export.sh
===================================================================
--- llvm/utils/release/export.sh
+++ 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
 }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D125798.430077.patch
Type: text/x-patch
Size: 1348 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220517/a9f9c6a9/attachment.bin>