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
cmd=$1
shift
+case "$cmd" in
+ release-*)
+ export LC_ALL=C
+ ;;
+esac
+
fix_upstream_rebase()
{
if [ -z "$r_me" ] || [ -z "$r_other" ]; then
verbose git config filter.mapclean.smudge "cat"
}
+mkzipr()
+{
+ archive=$1; shift
+ find "$@" -exec touch -d "1970-01-01 00:00:00 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly
+ ziplist=`mktemp`
+ find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
+ 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
+ zip -9y -@<"$ziplist" "$archive" || true
+ rm -f "$ziplist"
+}
+
mkzip()
{
- archive=$1
- shift
+ archive=$1; shift
ziplist=`mktemp`
find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist"
7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true
mkzip0()
{
- zip -0y "$@"
+ archive=$1; shift
+ zip -0ry "$archive" "$@"
}
mirrorspeed()
suf=$1; shift
if ! { time -p true; } >/dev/null 2>&1; then
+ msg "Cannot do timing in this shell"
return 1
fi
allow_pull=false
elif [ x"$1" = x"-p" ]; then
fix_config=true
- if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then
- pushbase=ssh://xonotic@git.xonotic.org/
- fi
+ pushbase=ssh://xonotic@git.xonotic.org/
+ elif [ x"$1" = x"-ps" ]; then
+ fix_config=true
+ pushbase=ssh://xonotic@git.xonotic.org/
+ elif [ x"$1" = x"-ph" ]; then
+ fix_config=true
+ pushbase=http://git.xonotic.org/login/xonotic/
elif [ x"$1" = x"-s" ]; then
fix_config=true
base=ssh://xonotic@git.xonotic.org/
- pushbase=
elif [ x"$1" = x"-g" ]; then
fix_config=true
base=git://git.xonotic.org/xonotic/
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
;;
best)
# if we fetched via ssh://, switch to git:// for fetching and keep using ssh:// for pushing
case "$base" in
- ssh://*)
+ ssh://*|*/login/*)
pushbase=$base
base=git://git.xonotic.org/xonotic/
;;
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
exit 1
fi
fi
- set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
+ set -- "darkplaces/darkplaces$client" -xonotic "$@"
# if pulseaudio is running: USE IT
if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
;;
admin-merge)
branch=$1
+ only_delete=false
+ case "$branch" in
+ -d)
+ branch=
+ only_delete=true
+ ;;
+ esac
t=`mktemp`
report=""
reportecho()
git push origin :"${ref#refs/remotes/origin/}"
reportecho4 "--> branch deleted"
fi
+ elif $only_delete; then
+ reportecho4 "--> skipped in delete-only run"
elif [ -z "$branch" ] && [ -n "$note" ]; then
reportdo4 $ECHO "$note"
reportecho4 "--> not merging, already had this one rejected before"
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 rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
- verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
+ verbose ssh "$host" "export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
for f in $targetfiles; do
verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
done
case "${f##*:}" in
Xonotic/xonotic*.exe)
verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}"
- (
- d=`mktemp -d -t rebrand.XXXXXX`
- cd "$d"
- $ECHO "-mygames" > darkplaces.opt
- zip -9r darkplaces.zip darkplaces.opt
- cat darkplaces.zip
- cd "$d0"
- rm -rf "$d"
- ) >> "${f##*:}"
;;
esac
done
;;
release-qc)
verbose make -C Xonotic/source FTEQCC="../../../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
- verbose rm -f Xonotic/source/*/fteqcc.log
+ verbose rm -f Xonotic/source/qcsrc/*/fteqcc.log
;;
release-buildpk3-transform-raw)
dir=$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
fi
verbose export git_src_repo="$d0/$src" # skip hash-object
verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
- verbose mkzip "../../$dst" *
+ verbose mkzipr "../../$dst" *
verbose cd ../..
verbose rm -rf Xonotic/temp
;;
done
;;
release-pack)
- verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
- verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' low '-low' lowdds '-lowdds' normaldds '-normaldds'
- verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' low '-low' lowdds '-lowdds' normaldds '-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/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 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-low.pk3 \
Xonotic/data/xonotic-$stamp-maps-low.pk3 \
Xonotic/data/xonotic-$stamp-music-low.pk3
- verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-normaldds.zip
- verbose mkzip0 Xonotic-$stamp-normaldds.zip \
- Xonotic/data/xonotic-$stamp-data-normaldds.pk3 \
- Xonotic/data/xonotic-$stamp-maps-normaldds.pk3 \
+ verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+ verbose mkzip0 Xonotic-$stamp-high.zip \
+ 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
- verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
- verbose mkzip0 Xonotic-$stamp-lowdds.zip \
- Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \
- Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \
- Xonotic/data/xonotic-$stamp-music-low.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"