(trafficserver) branch master updated: Fix tarball so it contains the distribution name (#11727)

[cmcfarlen]

This is an automated email from the ASF dual-hosted git repository.

cmcfarlen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new c23725407c Fix tarball so it contains the distribution name (#11727)
c23725407c is described below

commit c23725407c9ccb64dcb2e4123da9e95d791301dc
Author: Chris McFarlen <ch...@mcfarlen.us>
AuthorDate: Tue Aug 20 18:58:54 2024 -0500

    Fix tarball so it contains the distribution name (#11727)
---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79e178a607..926dcc7f8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -847,10 +847,10 @@ add_custom_target(
   COMMENT "Create distribution tarball for ASF"
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
   COMMAND rm -rf ${DISTTMP} && mkdir /tmp/asf-dist
-  COMMAND git archive --format=tar HEAD | tar -C ${DISTTMP} -xf -
-  COMMAND rm -rf ${DISTTMP}/ci
-  COMMAND grep -v img.shields.io ${DISTTMP}/README.md > 
${DISTTMP}/README.md.clean
-  COMMAND mv ${DISTTMP}/README.md.clean ${DISTTMP}/README.md
+  COMMAND git archive --format=tar --prefix=${DISTFILENAME}/ HEAD | tar -C 
${DISTTMP} -xf -
+  COMMAND rm -rf ${DISTTMP}/${DISTFILENAME}/ci
+  COMMAND grep -v img.shields.io ${DISTTMP}/${DISTFILENAME}/README.md > 
${DISTTMP}/${DISTFILENAME}/README.md.clean
+  COMMAND mv ${DISTTMP}/${DISTFILENAME}/README.md.clean 
${DISTTMP}/${DISTFILENAME}/README.md
 )
 
 add_custom_target(
@@ -858,7 +858,7 @@ add_custom_target(
   COMMENT "Create distribution tarball for ASF release"
   DEPENDS asf-distdir
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  COMMAND tar -C ${DISTTMP} -c . | bzip2 -9 -c > ${DISTFILENAME}.tar.bz2
+  COMMAND tar -C ${DISTTMP} -c ${DISTFILENAME} | bzip2 -9 -c > 
${DISTFILENAME}.tar.bz2
   COMMAND rm -rf ${DISTTMP}
 )
 
@@ -867,7 +867,7 @@ add_custom_target(
   COMMENT "Create distribution tarball for ASF release candidate"
   DEPENDS asf-distdir
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-  COMMAND tar -C ${DISTTMP} -c . | bzip2 -9 -c > 
${DISTFILENAME}-rc$ENV{RC}.tar.bz2
+  COMMAND tar -C ${DISTTMP} -c ${DISTFILENAME} | bzip2 -9 -c > 
${DISTFILENAME}-rc$ENV{RC}.tar.bz2
   COMMAND rm -rf ${DISTTMP}
 )