for d in $repos; do
p="${d%dir}"
f="`repoflags "$d"`"
- # if we have the dir, always keep it
- if [ -d "$d" ]; then
- msg "Repository $d enabled because it already exists"
- $ECHO "$d"
+ # if we have .no file, skip
+ if [ -f "$d.no" ]; then
+ msg "Repository $d disabled by a .no file, delete $d.no to enable"
continue
fi
# if .yes file exists, always keep it
$ECHO "$d"
continue
fi
- # if we have .no file, skip
- if [ -f "$d.no" ]; then
- msg "Repository $d disabled by a .no file, delete $d.no to enable"
+ # remove broken clones so they don't mess up stuff
+ if [ x"$d" != x"." ] && [ -d "$d" ] && ! [ -d "$d/.git" ]; then
+ msg "$d exists but has no .git subdir. Probably a broken clone. Deleting."
+ verbose rm -rf "$d"
+ continue
+ fi
+ # if we have the dir, always keep it
+ if [ -d "$d" ]; then
+ msg "Repository $d enabled because it already exists"
+ $ECHO "$d"
continue
fi
# if we have matching pk3, skip
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"
;;
update|pull)
allow_pull=true
- fix_config=false
location=current
+ oldbase=$base
+ oldpushbase=$pushbase
+ # transition old URLs
+ if [ x"$base" = x"ssh://xonotic@git.xonotic.org/" ]; then
+ base=ssh://xonotic@push.git.xonotic.org/
+ fi
+ if [ x"$pushbase" = x"ssh://xonotic@git.xonotic.org/" ]; then
+ pushbase=ssh://xonotic@push.git.xonotic.org/
+ fi
while :; do
if [ x"$1" = x"-N" ]; then
allow_pull=false
elif [ x"$1" = x"-p" ]; then
- fix_config=true
- pushbase=ssh://xonotic@git.xonotic.org/
+ pushbase=ssh://xonotic@push.git.xonotic.org/
elif [ x"$1" = x"-ps" ]; then
- fix_config=true
- pushbase=ssh://xonotic@git.xonotic.org/
+ pushbase=ssh://xonotic@push.git.xonotic.org/
elif [ x"$1" = x"-ph" ]; then
- fix_config=true
- pushbase=http://git.xonotic.org/login/xonotic/
+ pushbase=http://push.git.xonotic.org/login/xonotic/
elif [ x"$1" = x"-s" ]; then
- fix_config=true
- base=ssh://xonotic@git.xonotic.org/
+ base=ssh://xonotic@push.git.xonotic.org/
elif [ x"$1" = x"-g" ]; then
- fix_config=true
base=git://git.xonotic.org/xonotic/
+ location=best
elif [ x"$1" = x"-h" ]; then
- fix_config=true
base=http://git.xonotic.org/xonotic/
+ location=best
elif [ x"$1" = x"-l" ]; then
case "$2" in
nl) ;;
exit 1
;;
esac
- fix_config=true
location=$2
shift
else
esac
if [ -n "$location" ]; then
base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
- pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"`
else
base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
- pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"`
fi
- if $fix_config; then
+ pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://xonotic@push.git.xonotic.org/,"`
+ if [ x"$base" != x"$oldbase" ] || [ x"$pushbase" != x"$oldpushbase" ]; then
url=`repourl .`
pushurl=`repopushurl .`
fix_git_config "$url" "$pushurl"
- fi
- if $allow_pull || $fix_config; then
+ "$SELF" fix_config
+ elif $allow_pull; then
"$SELF" fix_config
fi
for d in $repos; do
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
if [ x"$USE_GDB" = x"yes" ]; then
set -- gdb --args "$@"
- elif [ x"$USE_GDB" != x"no" ] && which gdb >/dev/null 2>&1; then
+ elif [ x"$USE_GDB" = x"core" ] && which gdb >/dev/null 2>&1; then
set -- gdb --batch -x savecore.gdb --args "$@"
elif which catchsegv >/dev/null 2>&1; then
set -- catchsegv "$@"
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
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-20120114.tar.bz2
+ verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20120114-win32-7z.exe
for X in *-7z.exe; do
7za x "$X"
rm -f "$X"
verbose "$SELF" update-maps
;;
release-qc)
- verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+ verbose env GIT_DIR="$d0/data/xonotic-data.pk3dir/.git" make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
;;
release-buildpk3-transform-raw)
verbose export jpeg_qual_rgb=97
verbose export jpeg_qual_a=99
verbose export do_dds=false
- verbose export do_ogg=false
+ verbose export do_ogg=true
+ verbose export ogg_ogg=false
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
verbose export do_dds=true
verbose export dds_flags=
verbose export do_ogg=true
+ verbose export ogg_ogg=false
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
+ release-buildpk3-transform-mapping)
+ dir=$1
+ verbose cd "$dir"
+ # remove stuff radiant has no use for
+ verbose find . -name \*_norm.\* -exec rm -f {} \;
+ verbose find . -name \*_bump.\* -exec rm -f {} \;
+ verbose find . -name \*_glow.\* -exec rm -f {} \;
+ verbose find . -name \*_gloss.\* -exec rm -f {} \;
+ verbose find . -name \*_pants.\* -exec rm -f {} \;
+ verbose find . -name \*_shirt.\* -exec rm -f {} \;
+ verbose find . -name \*_reflect.\* -exec rm -f {} \;
+ verbose find . -not \( -name \*.tga -o -name \*.png -o -name \*.jpg \) -exec rm -f {} \;
+ # texture: convert to jpeg and dds
+ # music: reduce bitrate
+ verbose export do_jpeg=true
+ verbose export jpeg_qual_rgb=80
+ verbose export jpeg_qual_a=97
+ verbose export do_dds=false
+ verbose export do_ogg=true
+ verbose export ogg_qual=1
+ verbose export del_src=true
+ find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
+ ;;
release-buildpk3)
src=$1
dst=$2
versionstr="$versionstr$RELEASETYPE"
;;
esac
- if [ $gv -lt 900 ]; then
+ if [ $gv -lt 9900 ]; then
# pre-1.0: compatible with any other pre-1.0
verbose sed "
s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
release_timereport "processed data"
verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
release_timereport "transformed data"
+ find . -type f -size +4k | verbose "$d0"/misc/tools/symlink-deduplicate.sh
+ release_timereport "deduplicated data"
verbose mkzipr "../../$dst" *
release_timereport "zipped data"
verbose cd ../..
verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw ''
verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '-high' low '-low' normaldds ''
- verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '-high' low '-low' normaldds ''
+ verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '-high' low '-low' normaldds '' mapping '-mapping'
verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low'
verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir normal '-high' normaldds ''
;;
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-enginesource.zip \
+ Xonotic/source/darkplaces/ \
+ Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3
+ verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-engine.zip
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/xonotic.exe
verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
verbose mkzip Xonotic-$stamp-common.zip \
Xonotic/source/fteqcc/ \
Xonotic/key_0.d0pk \
Xonotic/data/font-nimbussansl-$stamp.pk3 \
Xonotic/data/font-xolonium-$stamp.pk3
+ verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip
+ verbose mkzip Xonotic-$stamp-source.zip \
+ Xonotic/source/fteqcc/ \
+ Xonotic/source/qcsrc/ \
+ Xonotic/misc/logos
verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
verbose mkzip0 Xonotic-$stamp.zip \
Xonotic/data/xonotic-$stamp-data.pk3 \
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-mapping.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"