mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into 2.1_pypi_integration

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
This commit is contained in:
Nico Schottelius 2012-10-25 22:35:20 +02:00
commit 5d319027d0
7 changed files with 55 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build
View file

@ -74,7 +74,7 @@ case "$1" in
;;
mantype)
for mansrc in conf/type/*/man.text; do
for mansrc in conf/type/*/man.text; do
dst="$(echo $mansrc | sed -e 's;conf/;cdist-;' -e 's;/;;' -e 's;/man;;' -e 's;^;docs/man/man7/;')"
ln -sf "../../../$mansrc" "$dst"
done
@ -174,12 +174,24 @@ case "$1" in
echo ''
echo 'Here are the possible targets:'
echo ''
echo ' clean: Remove build stuff'
echo ' man: Build manpages (requires Asciidoc)'
echo ' test: Run tests'
echo ' clean: Remove build stuff'
echo ' man: Build manpages (requires Asciidoc)'
echo ' test: Run tests'
echo ''
echo ''
echo "Unknown target, \"$1\"" >&2
exit 1
;;
version-dynamic)
cd lib/cdist/
ln -sf version_dynamic.py version.py
;;
version-dist)
version=$(cat .version)
cd lib/cdist/
echo "VERSION=\"$version\"" > version_static.py
ln -sf version_static.py version.py
;;
esac