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

cleanup release and build script

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-10-26 12:17:43 +02:00
parent c29b7f6814
commit 1064d8edd5
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build
View file

@ -122,11 +122,6 @@ case "$1" in
rm -rf ${WEBMAN}
mkdir -p ${WEBMAN}/man1 ${WEBMAN}/man7
# old stuff
# rm -rf ${WEBDIR}/${WEBBASE}/speeches && mkdir ${WEBDIR}/${WEBBASE}/speeches
# cp ${SPEECHESDIR}/*.pdf ${WEBDIR}/${WEBBASE}/speeches
# git describe > ${WEBDIR}/${WEBBASE}/man/VERSION
cp ${MAN1DSTDIR}/*.html ${MAN1DSTDIR}/*.css ${WEBMAN}/man1
cp ${MAN7DSTDIR}/*.html ${MAN7DSTDIR}/*.css ${WEBMAN}/man7

16
docs/dev/releasehelper Executable file → Normal file
View file

@ -30,10 +30,10 @@ read wait
version=$changelog_version
# get target branch
branch=${version%\.*}
target_branch=${version%\.*}
current_branch=$(git rev-parse --abbrev-ref HEAD)
echo "Selecting branch $branch for merging"
exit 0
echo "Selected branch $target_branch for merging $current_branch"
# add tag
printf "Enter tag description for %s> " "$version"
@ -41,14 +41,14 @@ read tagmessage
git tag "$version" -m "$tagmessage"
# Import into current version branch
printf "Press enter to git merge into branch \"$branch\" > "
printf "Press enter to git merge into branch \"$target_branch\" > "
read prompt
git checkout $branch
git merge master
git checkout master
git checkout "$target_branch"
git merge "$current_branch"
git checkout "$current_branch"
# Publish manpages and sourcecode
printf "Press enter to publish doc/ and code/ > "
printf "Press enter to publish doc/ code/ pypi for $version > "
read prompt
./build web
./build pub