smwltr/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Add version.py into generated raw source archive

Browse source 
Resolves #751
This commit is contained in:
Darko Poljak 2019-04-12 19:58:43 +02:00
parent 279aada5db
commit 20a16fe853
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/build-helper
View file

@ -195,9 +195,14 @@ eof
then then
archivename="$3" archivename="$3"
else else
archivename="cdist-${tag}.tar.gz" archivename="cdist-${tag}.tar"
git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \ git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1 || exit 1
# make sure target version is generated
"$0" target-version
tar -r -f "${archivename}" cdist/version.py || exit 1
gzip "${archivename}" || exit 1
archivename="${archivename}.gz"
fi fi
gpg --armor --detach-sign "${archivename}" || exit 1 gpg --armor --detach-sign "${archivename}" || exit 1
@ -232,7 +237,7 @@ eof
|| exit 1 || exit 1
# remove generated files (archive and asc) # remove generated files (archive and asc)
if [ $# -eq 2] if [ $# -eq 2 ]
then then
rm -f "${archivename}" rm -f "${archivename}"
fi fi

9
bin/build-helper.freebsd
View file

@ -230,9 +230,14 @@ eof
then then
archivename="$3" archivename="$3"
else else
archivename="cdist-${tag}.tar.gz" archivename="cdist-${tag}.tar"
git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \ git archive --prefix="cdist-${tag}/" -o "${archivename}" "${tag}" \
|| exit 1 || exit 1
# make sure target version is generated
"$0" target-version
tar -r -f "${archivename}" cdist/version.py || exit 1
gzip "${archivename}" || exit 1
archivename="${archivename}.gz"
fi fi
gpg --armor --detach-sign "${archivename}" || exit 1 gpg --armor --detach-sign "${archivename}" || exit 1
@ -267,7 +272,7 @@ eof
|| exit 1 || exit 1
# remove generated files (archive and asc) # remove generated files (archive and asc)
if [ $# -eq 2] if [ $# -eq 2 ]
then then
rm -f "${archivename}" rm -f "${archivename}"
fi fi

1
docs/changelog
View file

@ -3,6 +3,7 @@ Changelog
next: next:
* Core: Fix broken quiet mode (Darko Poljak) * Core: Fix broken quiet mode (Darko Poljak)
* Build: Add version.py into generated raw source archive (Darko Poljak)
4.10.10: 2019-04-11 4.10.10: 2019-04-11
* New types: __ufw and __ufw_rule (Mark Polyakov) * New types: __ufw and __ufw_rule (Mark Polyakov)