kjg/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

keep version generating in build-helper, so people cloning from git don't need make

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-06-07 21:14:51 +02:00
parent 9195c9b8e8
commit 0cf0cdd0c3
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -18,6 +18,10 @@
# #
# #
A2XM=a2x -f manpage --no-xmllint -a encoding=UTF-8
A2XH=a2x -f xhtml --no-xmllint -a encoding=UTF-8
helper=./build-helper
MANDIR=docs/man MANDIR=docs/man
MAN1DSTDIR=$(MANDIR)/man1 MAN1DSTDIR=$(MANDIR)/man1
MAN7DSTDIR=$(MANDIR)/man7 MAN7DSTDIR=$(MANDIR)/man7
@ -32,7 +36,6 @@ RELEASE=release-web release-man release-pypi release-archlinux-makepkg
RELEASE+=release-blog release-ml RELEASE+=release-blog release-ml
RELEASE+=release-freecode release-archlinux-aur-upload RELEASE+=release-freecode release-archlinux-aur-upload
helper=./build-helper
version=`git describe` version=`git describe`
versionchangelog=`$(helper) changelog-version` versionchangelog=`$(helper) changelog-version`
versionfile=cdist/version.py versionfile=cdist/version.py
@ -40,7 +43,7 @@ versionfile=cdist/version.py
archlinuxtar=cdist-${versionchangelog}-1.src.tar.gz archlinuxtar=cdist-${versionchangelog}-1.src.tar.gz
$(versionfile): $(versionfile):
echo $(version) > $@ $(helper) version
$(DIST): dist-check $(DIST): dist-check
@ -48,6 +51,12 @@ $(RELEASE): $(DIST) $(CHECKS)
man: $(MANREF) mantype manbuild man: $(MANREF) mantype manbuild
$(MAN7DSTDIR)/cdist-type__motd.7: $(MAN7DSTDIR)/cdist-type__motd.text
$(A2XM) $^
$(MAN7DSTDIR)/cdist-type__motd.text: cdist/conf/type/__motd/man.text
echo ln -sf $@ $^
$(MANREF): $(MANREFSH) $(MANREF): $(MANREFSH)
$(MANREFSH) $(MANREFSH)

2
bin/cdist
View file

@ -25,7 +25,7 @@ dir=${0%/*}
# Ensure version is present - the bundled/shipped version contains a static version, # Ensure version is present - the bundled/shipped version contains a static version,
# the git version contains a dynamic version # the git version contains a dynamic version
"$dir/../build" version "$dir/../build-helper" version
libdir=$(cd "${dir}/../" && pwd -P) libdir=$(cd "${dir}/../" && pwd -P)
export PYTHONPATH="${libdir}" export PYTHONPATH="${libdir}"

3
build-helper
View file

@ -299,6 +299,9 @@ eof
python3 -m unittest "$@" python3 -m unittest "$@"
fi fi
;; ;;
version)
git describe > cdist/version.py
;;
*) *)
echo "Unknown target $@ - aborting" echo "Unknown target $@ - aborting"