url_ssh=xonotic-beta:autobuild-bsp/
build_cachedir="$HOME/xonotic-map-compiler.cache/"
screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
-build_override="-bsp_timeout 5400 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+build_override="-bsp_timeout 3600 -vis_timeout 10800 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
screenshot_override="9 900 5 +g_ctf 1"
getthemap_fail=false
pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$commithash" | $IRCSPAM || true
fi
t0=`date +%s`
+ set +e
(
- cd maps
- 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
+ cd ../..
+ misc/tools/xonotic-map-compiler-optionsfile "data/xonotic-maps.pk3dir/maps/$M" $build_override > "data/xonotic-maps.pk3dir/maps/$M.log" 2>&1
)
status=$?
+ set -e
if ! [ -f "maps/$M.bsp" ]; then
- echo >>"$M.log" "ERROR: No BSP file"
+ echo >>"maps/$M.log" "ERROR: No BSP file"
fi
t1=`date +%s`
dt=$(($t1 - $t0))