set -e
bspdir="$PWD/data"
-url=http://beta.xonotic.org/autobuild-bsp/
+url_http=http://beta.xonotic.org/autobuild-bsp/
url_ssh=xonotic-beta:autobuild-bsp/
build_cachedir="$HOME/xonotic-map-compiler.cache/"
screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
build_override="-bsp_timeout 900 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
-screenshot_override="9 300"
+screenshot_override="9 600 +g_ctf 1"
getthemap_fail=false
allmaps()
{
- for F in maps/*.map.options; do
- if ! [ -f "$F" ]; then
- continue
- fi
- if ! [ -f "${F%.options}" ]; then
- continue
- fi
- M=${F#maps/}
- M=${M%.map.options}
- blobhash=`git ls-files -s -- "$F" | cut -d ' ' -f 2`-`git ls-files -s -- "${F%.options}" | cut -d ' ' -f 2`
- "$@" "$M" "$blobhash"
+ commithash=$1
+ shift
+ for F in `git show "${commithash}:maps/"`; do
+ case "$F" in
+ *.map.options)
+ ;;
+ *)
+ continue
+ ;;
+ esac
+ M=${F%.map.options}
+ blobhash=`git rev-parse --revs-only "${commithash}:maps/$M.map.options" || true`-`git rev-parse --revs-only "${commithash}:maps/$M.map" || true`
+ case "$blobhash" in
+ -*)
+ ;;
+ *-)
+ ;;
+ *)
+ "$@" "$M" "$blobhash" "$commithash"
+ ;;
+ esac
done
}
WARNING:\ Couldn\'t\ find\ image\ for\ shader\ *)
s_failshaders="$s_failshaders ${L##* }"
;;
+ ERROR:\ *)
+ if [ -z "$s_error" ]; then
+ s_error=$L
+ fi
+ ;;
'******* leaked *******')
s_leaked=1
;;
buildthemap()
{
REFNAME=$1
- HASH=$2
- url=$3
- M=$4
- blobhash=$5
+ url=$2
+ M=$3
+ blobhash=$4
+ commithash=$5
if HEAD "$url$M-$blobhash.pk3"; then
continue
fi
+
+ git reset --hard
+ git clean -xfd
+ git checkout -f "$commithash"
+
if [ -n "$IRCSPAM" ]; then
- pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM
+ pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM
fi
t0=`date +%s`
(
cd maps
- ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $build_override > "$M.log"
+ sz=`grep '^size ' "$M.mapinfo" 2>/dev/null || true`
+ if [ -n "$sz" ]; then
+ minimap_override="-minimap + -minmax ${sz#size }"
+ else
+ minimap_override=
+ fi
+ ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` $minimap_override $build_override > "$M.log" 2>&1
)
+ status=$?
+ if ! [ -f "maps/$M.bsp" ]; then
+ echo >>"$M.log" "ERROR: No BSP file"
+ fi
t1=`date +%s`
dt=$(($t1 - $t0))
- status=$?
if [ -n "$IRCSPAM" ]; then
- cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" "$status" "$dt" > "maps/$M.irc"
+ cat "maps/$M.log" | log2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" "$status" "$dt" > "maps/$M.irc"
fi
zip -9r "$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M.irc" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
ln -snf "../$M-$blobhash.pk3" "$M.pk3" # from ALL branches, so beware!
screenshotthemap()
{
REFNAME=$1
- HASH=$2
- url=$3
- M=$4
- blobhash=$5
+ url=$2
+ M=$3
+ blobhash=$4
+ commithash=$5
if HEAD "$url$M-$blobhash/"; then
continue
fi
+
+ if ! unzip -l "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp"; then
+ # no BSP file
+ continue
+ fi
+
rm -rf ~/.xonotic
(
cd ../..
- misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
+ if [ -n "$DISPLAY" ]; then
+ misc/tools/xonotic-map-screenshot "$M" $screenshot_override +"scr_screenshot_name \"$M-\""
+ else
+ startx "$PWD/misc/tools/xonotic-map-screenshot" "$M" $screenshot_override +"scr_screenshot_name \"$M-\"" -- :8
+ fi
)
if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
if [ -n "$IRCSPAM" ]; then
- ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" > "maps/$M.ircss"
+ #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
fi
return 1
fi
if [ -n "$IRCSPAM" ]; then
- ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" > "maps/$M.ircss"
+ #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
fi
+ chmod 1777 "$M-$blobhash"
ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
rsync -vaSHP "$M-$blobhash" "$url_ssh"
rsync -vaSHP "$M" "$url_ssh""latest/"
bspdir=$3
M=$4
blobhash=$5
+ commithash=$6
if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then
- continue
+ if unzip -l "$bspdir/$M-$blobhash.pk3" >/dev/null 2>&1; then
+ return 0
+ fi
fi
- if ! wget -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
+ if ! wget -c -O "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
if ! curl -o "$bspdir/$M-$blobhash.pk3" "$url$M-$blobhash.pk3"; then
rm -f "$bspdir/$M-$blobhash.pk3"
echo "WARNING: could not download $url$M-$blobhash.pk3, maybe not ready yet"
fi
}
+indexthemap()
+{
+ REFNAME=$1
+ M=$2
+ blobhash=$3
+ commithash=$4
+ echo "$M $blobhash $commithash $REFNAME"
+}
+
+rundownload()
+{
+ mkdir -p "$bspdir" "$bspdir.old"
+ for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+ if [ -e "$b" ]; then
+ mv "$b" "$bspdir.old"/
+ fi
+ done
+ allmaps "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir"
+}
+
+branches()
+{
+ git for-each-ref 'refs/remotes' | grep -vE ' refs/remotes/([^/]*/HEAD|.*/archived/.*)$'
+}
+
+runmakeindex()
+{
+ cd data/xonotic-maps.pk3dir
+ branches | while read -r HASH TYPE REFNAME; do
+ allmaps "$HASH" indexthemap "$REFNAME"
+ done
+ cd ../..
+}
+
case "$1" in
build)
cd data/xonotic-maps.pk3dir
- git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+ branches | while read -r HASH TYPE REFNAME; do
if [ -f "$build_cachedir/$HASH" ]; then
continue
fi
- git reset --hard
- git clean -xfd
- git checkout -f "$HASH"
- allmaps buildthemap "$REFNAME" "$HASH" "$url"
+ allmaps "$HASH" buildthemap "$REFNAME" "$url_http"
touch "$build_cachedir/$HASH"
done
git checkout -f master
;;
screenshot)
+ runmakeindex > "branches.idx.new"
+ rsync -vaSHP "branches.idx.new" "$url_ssh""branches.idx.new"
+ rm -f "branches.idx.new"
cd data/xonotic-maps.pk3dir
- git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+ branches | while read -r HASH TYPE REFNAME; do
if [ -f "$screenshot_cachedir/$HASH" ]; then
continue
fi
+
git reset --hard
git clean -xfd
git checkout -f "$HASH"
- allmaps getthemap "$url" "$bspdir.old" "$bspdir"
- if ! $getthemap_fail; then
- allmaps screenshotthemap "$REFNAME" "$HASH" "$url"
- touch "$screenshot_cachedir/$HASH"
+
+ rundownload
+ if $getthemap_fail; then
+ continue
fi
+
+ allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http"
+
+ touch "$screenshot_cachedir/$HASH"
done
git checkout -f master
;;
+ makeindex)
+ runmakeindex
+ ;;
download)
- mkdir -p "$bspdir" "$bspdir.old"
- for b in "$bspdir"/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
- if [ -e "$b" ]; then
- mv "$b" "$bspdir.old"/
- fi
- done
cd data/xonotic-maps.pk3dir
- allmaps getthemap "$url" "$bspdir.old" "$bspdir"
+ rundownload
+ cd ../..
echo "List of maps that got deleted (if any) and currently are in $bspdir.old:"
- ls -l "$bspdir.old"
+ ls -l "$bspdir.old" || true
;;
download-latest)
mkdir -p "$bspdir"
cd "$bspdir"
rm -f *-????????????????????????????????????????-????????????????????????????????????????.pk3
- wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url""latest"
+ wget -r -l1 -A "*.pk3" -N --no-parent --no-directories "$url_http""latest"
;;
log2spam-test)
log2spam "mapname" "http://mapurl" "branch" "commit" "0"
projects / xonotic / xonotic.git / blobdiff