fi
release_tempstarttime=$release_endtime
}
+ release_git_extract_dir()
+ {
+ release_src=$1; shift
+ release_dst=$1; shift
+ # try to create a hardlink
+ if ln -f "$release_src/.git/HEAD" "$release_dst/.hardlink-test"; then
+ rm -f "$release_dst/.hardlink-test"
+ {
+ verbose cd "$release_src"
+ git ls-files HEAD -- "$@"
+ } | {
+ while IFS= read -r F; do
+ case "$F" in */*) mkdir -p "$release_dst/${F%/*}" ;; esac
+ verbose ln -f "$release_src/$F" "$release_dst/$F"
+ done
+ }
+ else
+ {
+ verbose cd "$release_src"
+ verbose git archive --format=tar HEAD -- "$@"
+ } | {
+ verbose cd "$release_dst"
+ verbose tar xvf -
+ }
+ fi
+ }
;;
esac
fix_git_config()
{
+ if ! [ -f ".git/config" ]; then
+ $ECHO "Not a git repository. Bailing out to not cause damage."
+ exit 1
+ fi
verbose git config remote.origin.url "$1"
if [ -n "$2" ]; then
verbose git config remote.origin.pushurl "$2"
url=`repourl "$d"`
pushurl=`repopushurl "$d"`
branch=`repobranch "$d"`
- if [ -d "$d0/$d" ]; then
+ if [ -f "$d0/$d/.git/config" ]; then
verbose cd "$d0/$d"
fix_git_config "$url" "$pushurl"
cd "$d0"
url=`repourl "$d"`
pushurl=`repopushurl "$d"`
branch=`repobranch "$d"`
- if [ -d "$d0/$d" ]; then
+ if [ -f "$d0/$d/.git/config" ]; then
# if we have .no file, skip
if [ -f "$d0/$d.no" ]; then
msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated"
cd "$d0"
fi
else
+ if [ -d "$d0/$d" ]; then
+ if yesno "$d0/$d is in the way, get rid of it and reclone?"; then
+ verbose rm -rf "$d0/$d"
+ else
+ echo "Note: $d0/$d will stay broken."
+ continue
+ fi
+ fi
verbose git clone "$url" "$d0/$d"
enter "$d0/$d" verbose
fix_git_config "$url" "$pushurl"
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"
[5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
# gcc 4.3 or higher
# -march=native is broken < 4.3
- export CC="$CC -mtune=native -march=native"
+ if $CC -mtune=native -march=native misc/tools/conftest.c -o conftest >/dev/null 2>&1; then
+ export CC="$CC -mtune=native -march=native"
+ fi
;;
esac
if [ -n "$WE_HATE_OUR_USERS" ]; then
fi
if [ -z "$MAKEFLAGS" ]; then
if [ -f /proc/cpuinfo ]; then
- ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0))
+ ncpus=$((`grep -c '^processor :' /proc/cpuinfo || true`+0))
if [ $ncpus -gt 1 ]; then
MAKEFLAGS=-j$ncpus
fi
fi
fi
+
+ if ! verbose $CC misc/tools/conftest.c -o conftest; then
+ msg ""
+ msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+ msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~"
+ msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+ msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~"
+ msg "~~~~~~~~~~~,-' \\\`-._~~~~~~"
+ msg "~~~~~~~~~~/ --. >< \\~~~~~"
+ msg "~~~~~~~~~/ (*)> -<: \\~~~~"
+ msg "~~~~~~~~~( ^~-' (*) )~~~~"
+ msg "~~~~~~~~~\\ ^+-_/ |~~~~"
+ msg "~~~~~~~~~~\\ {vvv} |~~~~"
+ msg "~~~~~~~~~~,\\ , {^^^},/~~~~~"
+ msg "~~~~~~~~,/ \`---.....-'~~W~~~~"
+ msg "~~~~~~,/ \\_____/_\\_W~~/~~~~~"
+ msg "~~~~~/ /~~~\\__/~~~~~~"
+ msg "~~~~/ /~~~~~~~~~~~~~~"
+ msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+ msg "~~~~~~~ Y U NO COMPILE ~~~~~~~"
+ msg "~~~~~~~~~~~~ CODE ~~~~~~~~~~~~"
+ msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+ msg ""
+ exit 1
+ fi
+ rm -f conftest
+
verbose cd "$d0/d0_blind_id"
if ! $compiled0; then
# compilation of crypto library failed
else
verbose date +%Y%m%d > Xonotic/stamp.txt
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 COPYING GPL-2 GPL-3
+ (
verbose cd Xonotic
verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
- verbose tar xvf -
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
- }
- {
- verbose cd darkplaces
- verbose git archive --format=tar HEAD
- } | {
- 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
- } | {
+ )
+ 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" .
+ (
verbose cd Xonotic/source/d0_blind_id
- verbose tar xvf -
verbose sh autogen.sh
- }
+ )
rm -f Xonotic/key_15.d0pk
{
verbose cd Xonotic/mapping
- verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223.tar.bz2
- verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-win32-7z.exe
+ verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2
+ verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe
for X in *-7z.exe; do
7za x "$X"
rm -f "$X"
verbose rm -rf Xonotic/temp
release_timereport "deleted temp directory"
verbose mkdir -p Xonotic/temp
- {
- verbose cd "$src"
- verbose git archive --format=tar HEAD
- } | {
- verbose cd Xonotic/temp
- verbose tar xvf -
- }
+ 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 -i "
- 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
+ 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)
echo "" >> defaultXonotic.cfg
esac
(
verbose cd gfx/menu/luminos
+ verbose rm -f background_l2.tga background_ingame_l2.tga
verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
verbose rm background_l2.svg
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/ \
Xonotic/data/xonotic-$stamp-maps-low.pk3 \
Xonotic/data/xonotic-$stamp-music-low.pk3
verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+ verbose mkzip Xonotic-$stamp-high.zip \
+ Xonotic/mapping
verbose mkzip0 Xonotic-$stamp-high.zip \
Xonotic/data/xonotic-$stamp-data-high.pk3 \
Xonotic/data/xonotic-$stamp-maps-high.pk3 \
verbose mkzip Xonotic-$stamp-mappingsupport.zip \
Xonotic/mapping
verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \
- Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
+ Xonotic/data/xonotic-$stamp-maps-low.pk3
;;
release)
verbose "$SELF" release-prepare
$ECHO " $SELF checkout|switch <remote>/<branch>"
$ECHO " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
$ECHO " $SELF clean --reclone"
- $ECHO " $SELF compile [-c] [-r|-p] [-0]"
+ $ECHO " $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
$ECHO " $SELF each|foreach [-k] command..."
$ECHO " $SELF fix_upstream_rebase"
$ECHO " $SELF keygen"
$ECHO " $SELF merge"
$ECHO " $SELF push|commit [-s]"
- $ECHO " $SELF release"
$ECHO " $SELF restore-patches"
$ECHO " $SELF run [sdl|glx|wgl|agl|dedicated] options..."
$ECHO " $SELF save-patches"