Merge branch 'master' of ssh://git.xonotic.org/xonotic

diff --git a/all b/all
index bba700ae8f0d319b2fcdb465d234baf08a319bc9..35bc418f84ad71d273b968a6e5a63d1de5794edc 100755 (executable)
--- a/all
+++ b/all
@@ -647,6 +647,11 @@ case "$cmd" in
                                        HEAD|master)
                                                continue
                                                ;;
+                                       */*)
+                                               ;;
+                                       *)
+                                               continue
+                                               ;;
                                esac
                                if [ -n "$branch" ]; then
                                        if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
@@ -656,64 +661,80 @@ case "$cmd" in
                                reportecho "  Branch $ref:"
                                note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
                                logdata=`git log --color "$base".."$ref"`
-                               diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
                                if [ -z "$logdata" ]; then
                                        reportecho4 "--> not merging, no changes vs master"
-                               elif [ -z "$diffdata" ]; then
-                                       reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
-                                       if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
+                                       if yesno "Branch \"$ref\" probably should get deleted. Do it?" ''; then
                                                git push origin :"${ref#refs/remotes/origin/}"
                                                reportecho4 "--> branch deleted"
                                        fi
-                               elif [ -n "$note" ]; then
-                                       reportdo4 echo "$note"
-                                       reportecho4 "--> not merging, already had this one rejected before"
-                               elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
-                                       git checkout "$base"
-                                       org=`git rev-parse HEAD`
-                                       if ! git merge "$ref" 2>&1 | tee "$t"; then
-                                               git reset --hard "$org"
-                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
-                                               reportdo4 cat "$t"
-                                               reportecho4 "--> merge failed"
-                                       elif ! "$SELF" compile 2>&1 | tee "$t"; then
-                                               git reset --hard "$org"
-                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
-                                               reportdo4 cat "$t"
-                                               reportecho4 "--> compile failed"
-                                       elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
-                                               git reset --hard "$org"
-                                               git notes edit "$ref"
-                                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
-                                               reportdo4 echo "$note"
-                                               reportecho4 "--> test failed"
-                                       else
-                                               case ",`repoflags "$d"`," in
-                                                       *,svn,*)
-                                                               # we do quite a mess here... luckily we know $org
-                                                               git pull # svn needs to be current
-                                                               git rebase -i --onto master "$org"
-                                                               git svn dcommit --add-author-from
-                                                               git reset --hard "$org"
-                                                               ;;
-                                                       *)
-                                                               git push origin HEAD
-                                                               ;;
-                                               esac
-                                               reportecho4 "--> MERGED"
-                                               if yesno "Delete original branch \"$ref\"?"; then
+                               else
+                                       diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
+                                       if [ -z "$diffdata" ]; then
+                                               reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
+                                               if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
                                                        git push origin :"${ref#refs/remotes/origin/}"
                                                        reportecho4 "--> branch deleted"
                                                fi
-                                       fi
-                               else
-                                       GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
-                                       note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
-                                       if [ -n "$note" ]; then
+                                       elif [ -n "$note" ]; then
                                                reportdo4 echo "$note"
-                                               reportecho4 "--> rejected"
+                                               reportecho4 "--> not merging, already had this one rejected before"
+                                       elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
+                                               git checkout "$base"
+                                               org=`git rev-parse HEAD`
+                                               if ! git merge "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+                                                       git reset --hard "$org"
+                                                       GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
+                                                       reportdo4 cat "$t"
+                                                       reportecho4 "--> merge failed"
+                                               elif ! "$SELF" compile 2>&1 | tee "$t"; then
+                                                       git reset --hard "$org"
+                                                       GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
+                                                       reportdo4 cat "$t"
+                                                       reportecho4 "--> compile failed"
+                                               elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
+                                                       git reset --hard "$org"
+                                                       git notes edit "$ref"
+                                                       note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+                                                       if [ x"$note" = x"del" ]; then
+                                                               git push origin :"${ref#refs/remotes/origin/}"
+                                                               reportecho4 "--> test failed, branch deleted"
+                                                       elif [ -n "$note" ]; then
+                                                               reportdo4 echo "$note"
+                                                               reportecho4 "--> test failed"
+                                                       else
+                                                               reportecho4 "--> test failed, postponed"
+                                                       fi
+                                               else
+                                                       case ",`repoflags "$d"`," in
+                                                               *,svn,*)
+                                                                       # we do quite a mess here... luckily we know $org
+                                                                       git fetch # svn needs to be current
+                                                                       git rebase -i --onto origin/master "$org"
+                                                                       git svn dcommit --add-author-from
+                                                                       git reset --hard "$org"
+                                                                       ;;
+                                                               *)
+                                                                       git push origin HEAD
+                                                                       ;;
+                                                       esac
+                                                       reportecho4 "--> MERGED"
+                                                       if yesno "Delete original branch \"$ref\"?"; then
+                                                               git push origin :"${ref#refs/remotes/origin/}"
+                                                               reportecho4 "--> branch deleted"
+                                                       fi
+                                               fi
                                        else
-                                               reportecho4 "--> postponed"
+                                               GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
+                                               note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+                                               if [ x"$note" = x"del" ]; then
+                                                       git push origin :"${ref#refs/remotes/origin/}"
+                                                       reportecho4 "--> branch deleted"
+                                               elif [ -n "$note" ]; then
+                                                       reportdo4 echo "$note"
+                                                       reportecho4 "--> rejected"
+                                               else
+                                                       reportecho4 "--> postponed"
+                                               fi
                                        fi
                                fi
                                reportecho ""

diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt
deleted file mode 100644 (file)
index 73b57b5..0000000
--- a/data/scripts/shaderlist.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-common
-exosystem
-exx
-trak5x
-trak4x
-facility114x

diff --git a/misc/tools/update-shaderlists b/misc/tools/update-shaderlists
new file mode 100755 (executable)
index 0000000..788d929
--- /dev/null
+++ b/misc/tools/update-shaderlists
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+for X in "$PWD"/data/*/scripts; do
+       cd "$X"
+       for X in *.shader; do
+               if [ -f "$X" ]; then
+                       ls *.shader | sed 's/\.shader$//' > shaderlist.txt
+                       git add shaderlist.txt
+                       break
+               fi
+       done
+done

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 3f411004700a156e7bd8dff47ee7c1b53f524285..6405eb2b1fe7fc62e6f56cdfedddd898cce96729 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -123,7 +123,7 @@ buildthemap()
        fi
        (
                cd maps
-               ../../../misc/tools/xonotic-map-compiler "$M" `head -n 1 "$M.map.options"` 2>&1 | tee "$M.log"
+               ../../../misc/tools/xonotic-map-compiler "$M" `grep ^- "$M.map.options" | cut -d '#' -f 1` 2>&1 | tee "$M.log"
        )
        zip -9r "$bspdir/$M-$blobhash.pk3" "maps/$M.bsp" "maps/$M.log" "maps/$M/" "maps/$M.lin" "gfx/${M}_mini.tga"
        ln -snf "../$M-$blobhash.pk3" "$bspdir/latest/$M.pk3" # from ALL branches, so beware!