rename to check-cvars
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:41:50 +0000 (10:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Jan 2012 09:41:50 +0000 (10:41 +0100)
Makefile
check-cvars.sh [new file with mode: 0755]
update-cvarcount.sh [deleted file]

index abd82b1..6d0e9a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,18 @@ DIFF ?= diff
 # It will automagically add an engine check with -TID and then change back to -TFTE
 FTEQCCFLAGS_CSPROGS ?= 
 
-# xonotic build system overrides this by command line argument to turn off the update-cvarcount step
+# xonotic build system overrides this by command line argument to turn off the check-cvars step
 XON_BUILDSYSTEM =
 
 all: qc
 
-.PHONY: update-cvarcount
-update-cvarcount:
+.PHONY: check-cvars
+check-cvars:
        [ "$(XON_BUILDSYSTEM)" = "" ] || [ "$(XON_BUILDSYSTEM)" = "1" ]
-       [ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
+       [ "$(XON_BUILDSYSTEM)" = "1" ] || { DO_NOT_RUN_MAKE=1 sh check-cvars.sh; }
 
 .PHONY: qc
-qc: update-cvarcount
+qc: check-cvars
        $(MAKE) -C qcsrc
 
 .PHONY: skin
diff --git a/check-cvars.sh b/check-cvars.sh
new file mode 100755 (executable)
index 0000000..78985b8
--- /dev/null
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+errord=false
+
+check_files()
+{
+       countw=`awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+       for b in $2; do
+               countb=`awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
+               if [ "$countw" != "$countb" ]; then
+                       echo "Mismatch between "$1" and $b. Aborting."
+                       echo "Differences are:"
+                       echo "< missing in $b"
+                       echo "> must get removed from $b"
+                       A=`mktemp || echo a.tmp`
+                       B=`mktemp || echo b.tmp`
+                       awk ''"$3"' { print $2; }' "$1"      | sort -u | tr -d '\r' > "$A"
+                       awk ''"$3"' { print $2; }' "$b"                     | sort -u | tr -d '\r' > "$B"
+                       diff "$A" "$B" | grep '^[<>]' | sort
+                       rm -f "$A" "$B"
+                       errord=true
+               fi
+       done
+}
+
+check_files "balanceXonotic.cfg" "balance*.cfg" "/^seta? g_/"
+check_files "_hud_descriptions.cfg" "hud_*.cfg" "/^seta? hud_/"
+
+if $errord; then
+       echo "Please wait for 30 seconds, so you have had enough time to read this..."
+       sleep 30
+fi
diff --git a/update-cvarcount.sh b/update-cvarcount.sh
deleted file mode 100755 (executable)
index 78985b8..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-errord=false
-
-check_files()
-{
-       countw=`awk ''"$3"' { print $2; }' "$1" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
-       for b in $2; do
-               countb=`awk ''"$3"' { print $2; }' "$b" | sort -u | tr -d '\r' | git hash-object --stdin | cut -c 1-32`
-               if [ "$countw" != "$countb" ]; then
-                       echo "Mismatch between "$1" and $b. Aborting."
-                       echo "Differences are:"
-                       echo "< missing in $b"
-                       echo "> must get removed from $b"
-                       A=`mktemp || echo a.tmp`
-                       B=`mktemp || echo b.tmp`
-                       awk ''"$3"' { print $2; }' "$1"      | sort -u | tr -d '\r' > "$A"
-                       awk ''"$3"' { print $2; }' "$b"                     | sort -u | tr -d '\r' > "$B"
-                       diff "$A" "$B" | grep '^[<>]' | sort
-                       rm -f "$A" "$B"
-                       errord=true
-               fi
-       done
-}
-
-check_files "balanceXonotic.cfg" "balance*.cfg" "/^seta? g_/"
-check_files "_hud_descriptions.cfg" "hud_*.cfg" "/^seta? hud_/"
-
-if $errord; then
-       echo "Please wait for 30 seconds, so you have had enough time to read this..."
-       sleep 30
-fi