while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do
eval "$2"
$ECHO "$1"
- IFS= read -r yesno
+ if ! IFS= read -r yesno; then
+ yesno=n
+ break
+ fi
done
[ x"$yesno" = x"y" ]
}
fi
# if we have .no file, skip
if [ -f "$d.no" ]; then
- msg "Repository $d disabled by a .no file, delete $p.no to enable"
+ msg "Repository $d disabled by a .no file, delete $d.no to enable"
continue
fi
# if we have matching pk3, skip
mkzip0()
{
- zip -0y "$@"
+ zip -0ry "$@"
}
mirrorspeed()
suf=$1; shift
if ! { time -p true; } >/dev/null 2>&1; then
+ msg "Cannot do timing in this shell"
return 1
fi
pushbase=ssh://xonotic@git.xonotic.org/
elif [ x"$1" = x"-ph" ]; then
fix_config=true
- pushbase=http://git.xonotic.org/login/
+ pushbase=http://git.xonotic.org/login/xonotic/
elif [ x"$1" = x"-s" ]; then
fix_config=true
base=ssh://xonotic@git.xonotic.org/
case "$location" in
current)
if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then
- git config xonotic.all.mirrorselection done
location=best
fi
;;
case "$newbase" in
*\ *)
if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much
- :
+ git config xonotic.all.mirrorselection done
else
location=current
fi
pushurl=`repopushurl "$d"`
branch=`repobranch "$d"`
if [ -d "$d0/$d" ]; 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"
+ continue
+ fi
if $allow_pull; then
enter "$d0/$d" verbose
r=`git symbolic-ref HEAD`
;;
esac
fi
+ if [ -n "$checkoutflags" ]; then
+ set -- -f "$@" # to make checkself work again
+ fi
exists=false
for d in $repos; do
enter "$d0/$d" verbose
cleanqc=true
shift
;;
- -r)
- debug=release
+ -r|-p)
+ case "$1" in
+ -p)
+ debug=profile
+ ;;
+ -r)
+ debug=release
+ ;;
+ esac
export CC="$CC -g"
case "`$CC -dumpversion`" in
[5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
fi
fi
- enter "$d0/d0_blind_id" verbose
+ verbose cd "$d0/d0_blind_id"
if ! $compiled0; then
# compilation of crypto library failed
# use binaries then, if we can...
verbose make $MAKEFLAGS
fi
- enter "$d0/fteqcc" verbose
+ verbose cd "$d0/fteqcc"
if $cleanqcc; then
verbose make $MAKEFLAGS clean
fi
verbose make $MAKEFLAGS
- enter "$d0/data/xonotic-data.pk3dir" verbose
+ verbose cd "$d0/data/xonotic-data.pk3dir"
if $cleanqc; then
verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean
fi
verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS
# 4 levels up: data, xonotic-data, qcsrc, server
- enter "$d0/darkplaces" verbose
+ verbose cd "$d0/darkplaces"
if [ x"$BAD_TARGETS" = x" " ]; then
$ECHO "Warning: invalid empty client, default clients will be used."
fi
msg "Unknown arg: $X"
fi
found=true
- shift
done
if ! $found; then
rmuntracked=true
fi
verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | {
verbose cd Xonotic
- verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id
+ 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 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
+ for X in *-7z.exe; do
+ 7za x "$X"
+ rm -f "$X"
+ done
+ # TODO possibly include other tools?
+ }
;;
release-compile-run)
host=$1
verbose cd "$dir"
# texture: convert to jpeg and dds
verbose export do_jpeg=true
- verbose export jpeg_qual_rgb=95
+ verbose export jpeg_qual_rgb=97
verbose export jpeg_qual_a=99
- verbose export do_dds=true
- verbose export dds_flags=
+ verbose export do_dds=false
verbose export do_ogg=false
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-pack)
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-music.pk3dir raw '' low '-low'
- verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
+ verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir normal '-high' normaldds ''
;;
release-pack-needsx11)
case "$DISPLAY" in
Xonotic/fteqcc \
Xonotic/server \
Xonotic/key_0.d0pk \
- Xonotic/data/font-nimbussansl-$stamp.pk3
+ Xonotic/data/font-nimbussansl-$stamp.pk3 \
+ Xonotic/data/font-xolonium-$stamp.pk3
verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
verbose mkzip0 Xonotic-$stamp.zip \
Xonotic/data/xonotic-$stamp-data.pk3 \
Xonotic/data/xonotic-$stamp-data-high.pk3 \
Xonotic/data/xonotic-$stamp-maps-high.pk3 \
Xonotic/data/xonotic-$stamp-music.pk3 \
- Xonotic/data/xonotic-$stamp-nexcompat.pk3
+ Xonotic/data/xonotic-$stamp-nexcompat-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
;;
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] [-0]"
+ $ECHO " $SELF compile [-c] [-r|-p] [-0]"
$ECHO " $SELF each|foreach [-k] command..."
$ECHO " $SELF fix_upstream_rebase"
$ECHO " $SELF keygen"