From 808e45666e76c23b255cbd4b6ef2e867b152fad1 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Thu, 6 Dec 2018 08:12:38 +0100
Subject: [PATCH] [cmake] distsrc: use tag, gitinfo.txt from CMake.
---
CMakeLists.txt | 3 +--
build/unix/makedistsrc.sh | 23 +++++++++--------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93961dbe94e..4392c8a0d4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -434,8 +434,7 @@ add_custom_target(version COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makeversion.sh
endif()
#---distribution commands------------------------------------------------------------------------
-add_custom_target(distsrc COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makedistsrc.sh ${CMAKE_SOURCE_DIR}
- DEPENDS ${CMAKE_BINARY_DIR}/include/RGitCommit.h)
+add_custom_target(distsrc COMMAND ${CMAKE_SOURCE_DIR}/build/unix/makedistsrc.sh "${ROOT_VERSION}" "${GIT_DESCRIBE_ALWAYS}" "${CMAKE_SOURCE_DIR}")
add_custom_target(dist COMMAND cpack --config CPackConfig.cmake)
#---Configure and install various files neded later and for clients -----------------------------
diff --git a/build/unix/makedistsrc.sh b/build/unix/makedistsrc.sh
index 1fcba34ddb2..ad443dc5bb5 100755
--- a/build/unix/makedistsrc.sh
+++ b/build/unix/makedistsrc.sh
@@ -1,24 +1,19 @@
#! /bin/sh
-ROOTSRCDIR=$1
+FILEVERS=$1
+GITTAG=$2
+ROOTSRCDIR=$3
-CURVERS=`cat $ROOTSRCDIR/build/version_number | sed -e "s/^/v/" -e "s/\./-/" -e "s/\//-/"`
-ROOTVERS=`cat $ROOTSRCDIR/build/version_number | sed -e 's/\//\./'`
-TYPE=source
-TARFILE=root_v$ROOTVERS.$TYPE.tar
+TARFILE=root_v$FILEVERS.source.tar
-( cd $ROOTSRCDIR; git checkout $CURVERS )
-# generate etc/gitinfo.txt
-$ROOTSRCDIR/build/unix/gitinfo.sh $ROOTSRCDIR
+( cd $ROOTSRCDIR; git archive -v -o ../$TARFILE --prefix=root-$FILEVERS/ $GITTAG )
-( cd $ROOTSRCDIR; git archive -v -o ../$TARFILE --prefix=root-$ROOTVERS/ $CURVERS )
-
-mkdir -p etc/root-$ROOTVERS/etc
-cp etc/gitinfo.txt etc/root-$ROOTVERS/etc/
+mkdir -p etc/root-$FILEVERS/etc
+cp etc/gitinfo.txt etc/root-$FILEVERS/etc/
cd etc
-tar -r -vf ../../$TARFILE root-$ROOTVERS/etc/gitinfo.txt
+tar -r -vf ../../$TARFILE root-$FILEVERS/etc/gitinfo.txt
cd ..
-rm -rf etc/root-$ROOTVERS
+rm -rf etc/root-$FILEVERS
cd ..
gzip $TARFILE
--
GitLab