Make: Move .tarball-version generation out of src/scripts/tarball

Commit 1ec9b94 made src/scripts/tarball generate .tarball-version and
.dirty-stamp.  Hardcoding it like that there is a bit ugly.

Move it into a separate tweak script that is run right before tar.
We'll tweak some more in the next commits.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-08-13 14:00:16 +02:00
parent 240474195d
commit 63c6dd6896
3 changed files with 24 additions and 5 deletions

View file

@ -386,7 +386,7 @@ info.ps: info/TROFF.MAC info/INFO.MAC info/TOP.t $(tsubj) $(tsrc)
.PHONY: dist-source
dist-source: $(addprefix $(srcdir)/, $(src_distgen))
$(tarball) $(TARNAME) $(version) -C $(srcdir) $(src_distgen) $(src)
$(tarball) -x $(srcdir)/src/scripts/gen-tarball-version $(TARNAME) $(version) -C $(srcdir) $(src_distgen) $(src)
ifeq ($(revctrl),git)
.PHONY: $(srcdir)/sources.mk
@ -396,7 +396,8 @@ endif
.PHONY: dist-client
dist-client: $(addprefix $(srcdir)/, $(cli_distgen))
$(tarball) $(TARNAME)-client $(version) \
$(tarball) -x $(srcdir)/src/scripts/gen-tarball-version \
$(TARNAME)-client $(version) \
-C $(srcdir)/src/client \
$(notdir $(filter src/client/%, $(src)) $(cli_distgen)) \
-C $(srcdir)/include fnameat.h proto.h version.h \

11
src/scripts/gen-tarball-version Executable file
View file

@ -0,0 +1,11 @@
#!/bin/sh -e
if [ $# = 0 ]; then
echo "Usage: $0 NAME VERSION (FILE | -C DIR)..."
exit 1
fi
nv=$1-$2
printf "%s" "$2" >$nv/.tarball-version
>$nv/.dirty-stamp

View file

@ -1,18 +1,23 @@
#!/bin/sh -e
if [ $# = 0 ]; then
echo "Usage: $0 NAME (FILE | -C DIR)..."
echo "Usage: $0 [-x TWEAK-SCRIPT ] NAME VERSION (FILE | -C DIR)..."
exit 1
fi
script=:
if [ "$1" == -x ]
then
script=$2
shift; shift
fi
name="$1"
version="$2"
shift; shift
nv=$name-$version
mkdir $nv
printf "%s" $version >$nv/.tarball-version
>$nv/.dirty-stamp
# arrange cleanup
trap 'rm -rf "$nv"' 0
@ -30,4 +35,6 @@ until [ $# = 0 ]; do
shift
done
$script $name $version
tar -czf $nv.tar.gz --owner=0 --group=0 --mode=ug+w,a+rX $nv