git ls-files HEAD -- "$@"
} | {
while IFS= read -r F; do
- case "$F" in */*) mkdir -p "$release_dst/${F%/}" ;; esac
+ case "$F" in */*) mkdir -p "$release_dst/${F%/*}" ;; esac
verbose ln -f "$release_src/$F" "$release_dst/$F"
done
}
else
b=`repobranch "$d"`
if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
- exists=true
verbose git checkout $checkoutflags "$b"
elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
- exists=true
verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
else
$ECHO "WTF? Not even branch $b doesn't exist in $d"
else
verbose date +%Y%m%d > Xonotic/stamp.txt
fi
- release_git_extract_dir "." "Xonotic" 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 COPYING GPL-2 GPL-3
(
verbose cd Xonotic
verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
verbose rm -rf misc/builddeps
- verbose mv misc/buildfiles/win32/* . || true
+ verbose mv misc/buildfiles/win32 bin32 || true
+ verbose mv bin32/SDL.dll . || true
verbose mv misc/buildfiles/win64 bin64 || true
verbose mv misc/buildfiles/osx/* . || true
verbose rm -rf misc/buildfiles
verbose rm -rf misc/pki
)
- release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces"
- release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc"
+ release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces" .
+ release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc" .
release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
- release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id"
+ release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id" .
(
verbose cd Xonotic/source/d0_blind_id
verbose sh autogen.sh
verbose rm -rf Xonotic/temp
release_timereport "deleted temp directory"
verbose mkdir -p Xonotic/temp
- release_git_extract_dir "$src" "Xonotic/temp"
+ release_git_extract_dir "$src" "Xonotic/temp" .
release_timereport "extracted data"
verbose cd Xonotic/temp
if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
versionstr="$versionstr$RELEASETYPE"
;;
esac
- verbose sed "
- s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
- s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
- s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
- " < defaultXonotic.cfg > defaultXonotic.cfg.new
+ if [ $gv -lt 900 ]; then
+ # pre-1.0: compatible with any other pre-1.0
+ verbose sed "
+ s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
+ s/^gameversion_min [0-9]*/gameversion_min 0/;
+ s/^gameversion_max [0-9]*/gameversion_max 9999/;
+ " < defaultXonotic.cfg > defaultXonotic.cfg.new
+ else
+ # >= 1.0
+ verbose sed "
+ s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
+ s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
+ s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
+ " < defaultXonotic.cfg > defaultXonotic.cfg.new
+ fi
mv defaultXonotic.cfg.new defaultXonotic.cfg
case "$RELEASETYPE" in
release)
crypto_libs=`find Xonotic -name \*d0_rijndael\*.so -o -name \*d0_rijndael\*.dylib -o -name \*d0_rijndael\*.dll -o -name \*d0_rijndael\*.c`
if [ -n "$crypto_libs" ]; then
verbose mkzip Xonotic-$stamp-crypto.zip \
- $crypto_libs
+ $crypto_libs \
+ Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
rm -f $crypto_libs
fi
# build the archives
verbose mkzip Xonotic-$stamp-engine.zip \
- Xonotic/*.dll \
+ Xonotic/bin32/*.dll \
Xonotic/bin64/*.dll \
Xonotic/*.app \
Xonotic/xonotic-* \
Xonotic/xonotic.exe \
- Xonotic/source/darkplaces/
+ Xonotic/source/darkplaces/ \
+ Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
verbose mkzip Xonotic-$stamp-common.zip \
Xonotic/source/fteqcc/ \