refactor ./all a bit

This commit is contained in:
Rudolf Polzer 2011-05-27 09:39:09 +02:00
parent 0be4e76a8d
commit 5704b04ed3

59
all
View File

@ -291,6 +291,18 @@ case "$cmd" in
fi fi
release_tempstarttime=$release_endtime release_tempstarttime=$release_endtime
} }
release_git_extract_dir()
{
release_src=$1; shift
release_dst=$1; shift
{
verbose cd "$release_src"
verbose git archive --format=tar HEAD -- "$@"
} | {
verbose cd "$release_dst"
verbose tar xvf -
}
}
;; ;;
esac esac
@ -1580,46 +1592,25 @@ case "$cmd" in
else else
verbose date +%Y%m%d > Xonotic/stamp.txt verbose date +%Y%m%d > Xonotic/stamp.txt
fi fi
verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | { release_git_extract_dir "." "Xonotic" Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk
(
verbose cd Xonotic verbose cd Xonotic
verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
verbose tar xvf -
verbose rm -rf misc/builddeps verbose rm -rf misc/builddeps
verbose mv misc/buildfiles/win32/* . || true verbose mv misc/buildfiles/win32/* . || true
verbose mv misc/buildfiles/win64 bin64 || true verbose mv misc/buildfiles/win64 bin64 || true
verbose mv misc/buildfiles/osx/* . || true verbose mv misc/buildfiles/osx/* . || true
verbose rm -rf misc/buildfiles verbose rm -rf misc/buildfiles
verbose rm -rf misc/pki verbose rm -rf misc/pki
} )
{ release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces"
verbose cd darkplaces release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc"
verbose git archive --format=tar HEAD release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
} | { release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id"
verbose cd Xonotic/source/darkplaces (
verbose tar xvf -
}
{
verbose cd fteqcc
verbose git archive --format=tar HEAD
} | {
verbose cd Xonotic/source/fteqcc
verbose tar xvf -
}
{
verbose cd data/xonotic-data.pk3dir
verbose git archive --format=tar HEAD -- qcsrc Makefile
} | {
verbose cd Xonotic/source
verbose tar xvf -
}
{
verbose cd d0_blind_id
verbose git archive --format=tar HEAD
} | {
verbose cd Xonotic/source/d0_blind_id verbose cd Xonotic/source/d0_blind_id
verbose tar xvf -
verbose sh autogen.sh verbose sh autogen.sh
} )
rm -f Xonotic/key_15.d0pk rm -f Xonotic/key_15.d0pk
{ {
verbose cd Xonotic/mapping verbose cd Xonotic/mapping
@ -1822,13 +1813,7 @@ case "$cmd" in
verbose rm -rf Xonotic/temp verbose rm -rf Xonotic/temp
release_timereport "deleted temp directory" release_timereport "deleted temp directory"
verbose mkdir -p Xonotic/temp verbose mkdir -p Xonotic/temp
{ release_git_extract_dir "$src" "Xonotic/temp"
verbose cd "$src"
verbose git archive --format=tar HEAD
} | {
verbose cd Xonotic/temp
verbose tar xvf -
}
release_timereport "extracted data" release_timereport "extracted data"
verbose cd Xonotic/temp verbose cd Xonotic/temp
if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then