X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fxonotic-map-compiler-autobuild;h=173f1937069189fe12c8176928a0fb7cbd265eda;hp=fdde421de67d518704bc81605dc1811b0c041d78;hb=e2734f595d2be7187a8e82ee6377d56b787169bd;hpb=d874cfb9ed52bfdf43c8e533c7208295d597ac2b;ds=sidebyside diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild index fdde421d..173f1937 100755 --- a/misc/tools/xonotic-map-compiler-autobuild +++ b/misc/tools/xonotic-map-compiler-autobuild @@ -8,23 +8,27 @@ 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 +g_ctf 1" +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 + commithash=$1 + shift + for F in `git ls-files "$commithash" -- maps/\*.map.options`; do 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" + 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 } @@ -144,13 +148,18 @@ log2spam() buildthemap() { REFNAME=$1 - HASH=$2 - url=$3 - M=$4 - blobhash=$5 + url=$2 + M=$3 + blobhash=$4 + HASH=$5 if HEAD "$url$M-$blobhash.pk3"; then continue fi + + git reset --hard + git clean -xfd + git checkout -f "$HASH" + if [ -n "$IRCSPAM" ]; then pre2spam "$M" "$url$M-$blobhash.pk3" "$REFNAME" "$HASH" | $IRCSPAM fi @@ -180,13 +189,18 @@ buildthemap() screenshotthemap() { REFNAME=$1 - HASH=$2 - url=$3 - M=$4 - blobhash=$5 + url=$2 + M=$3 + blobhash=$4 + HASH=$5 if HEAD "$url$M-$blobhash/"; then continue fi + + git reset --hard + git clean -xfd + git checkout -f "$HASH" + rm -rf ~/.xonotic ( cd ../.. @@ -198,13 +212,16 @@ screenshotthemap() ) if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then if [ -n "$IRCSPAM" ]; then - ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" + #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" + ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 1 > "maps/$M.ircss" fi return 1 fi if [ -n "$IRCSPAM" ]; then - ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss" + #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$HASH" 0 > "maps/$M.ircss" + ss2spam "$M" "$url?d" "$REFNAME" "$HASH" 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/" @@ -220,6 +237,7 @@ getthemap() bspdir=$3 M=$4 blobhash=$5 + HASH=$6 if mv "$bspdir_old/$M-$blobhash.pk3" "$bspdir/$M-$blobhash.pk3"; then continue fi @@ -239,67 +257,80 @@ getthemap() fi } +indexthemap() +{ + REFNAME=$1 + M=$2 + blobhash=$3 + HASH=$4 + echo "$M $blobhash $HASH $REFNAME" +} + +rundownload() +{ + 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 "HEAD" getthemap "$url_http" "$bspdir.old" "$bspdir" + cd ../.. +} + +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 +} + case "$1" in build) cd data/xonotic-maps.pk3dir - git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do - case "$REFNAME" in - */archived/*) - continue - ;; - esac + 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_http" + allmaps "$HASH" buildthemap "$REFNAME" "$url_http" touch "$build_cachedir/$HASH" done git checkout -f master ;; screenshot) cd data/xonotic-maps.pk3dir - git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do - case "$REFNAME" in - */archived/*) - continue - ;; - esac + 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" - - cd ../.. - 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_http" "$bspdir.old" "$bspdir" - if ! $getthemap_fail; then - allmaps screenshotthemap "$REFNAME" "$HASH" "$url_http" - touch "$screenshot_cachedir/$HASH" + rundownload + if $getthemap_fail; then + continue fi + + cd data/xonotic-maps.pk3dir + + allmaps "$HASH" screenshotthemap "$REFNAME" "$url_http" + touch "$screenshot_cachedir/$HASH" done git checkout -f master + runmakeindex > branches.idx.new + rsync -vaSHP "$branches.idx.new" "$url_ssh""branches.idx.new" + rm -f branches.idx.new + ;; + 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_http" "$bspdir.old" "$bspdir" + rundownload echo "List of maps that got deleted (if any) and currently are in $bspdir.old:" ls -l "$bspdir.old" ;;