convert the txt files explicitly to DOS format, and make them "binary" in .gitattributes

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 9e1f3ec20c02f7792f86d381e39128fcdb6d87ed..fc966598fc79f6f975f306999a8e6c5ae0f7b008 100755 (executable)
--- a/all
+++ b/all
@@ -520,7 +520,7 @@ case "$cmd" in
                        url=`repourl "$d"`
                        pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
-                       if [ -d "$d0/$d" ]; then
+                       if [ -f "$d0/$d/.git/config" ]; then
                                verbose cd "$d0/$d"
                                fix_git_config "$url" "$pushurl"
                                cd "$d0"
@@ -727,7 +727,7 @@ case "$cmd" in
                                fi
                        else
                                if [ -d "$d0/$d" ]; then
-                                       if yesno "$d0/$d is in the way, get rid of it?"; then
+                                       if yesno "$d0/$d is in the way, get rid of it and reclone?"; then
                                                verbose rm -rf "$d0/$d"
                                        else
                                                echo "Note: $d0/$d will stay broken."
@@ -963,7 +963,9 @@ case "$cmd" in
                                                [5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*)
                                                        # gcc 4.3 or higher
                                                        # -march=native is broken < 4.3
-                                                       export CC="$CC -mtune=native -march=native"
+                                                       if $CC -mtune=native -march=native misc/tools/conftest.c -o conftest >/dev/null 2>&1; then
+                                                               export CC="$CC -mtune=native -march=native"
+                                                       fi
                                                        ;;
                                        esac
                                        if [ -n "$WE_HATE_OUR_USERS" ]; then
@@ -1033,7 +1035,7 @@ case "$cmd" in
                fi
                if [ -z "$MAKEFLAGS" ]; then
                        if [ -f /proc/cpuinfo ]; then
-                               ncpus=$((`grep -c '^processor   :' /proc/cpuinfo`+0))
+                               ncpus=$((`grep -c '^processor   :' /proc/cpuinfo || true`+0))
                                if [ $ncpus -gt 1 ]; then
                                        MAKEFLAGS=-j$ncpus
                                fi
@@ -1043,6 +1045,33 @@ case "$cmd" in
                        fi
                fi
 
+               
+               if ! verbose $CC misc/tools/conftest.c -o conftest; then
+                       msg ""
+                       msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+                       msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~"
+                       msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+                       msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~"
+                       msg "~~~~~~~~~~~,-'     \\\`-._~~~~~~"
+                       msg "~~~~~~~~~~/     --. ><  \\~~~~~"
+                       msg "~~~~~~~~~/      (*)> -<: \\~~~~"
+                       msg "~~~~~~~~~(     ^~-'  (*) )~~~~"
+                       msg "~~~~~~~~~\\        ^+-_/  |~~~~"
+                       msg "~~~~~~~~~~\\       {vvv}  |~~~~"
+                       msg "~~~~~~~~~~,\\    , {^^^},/~~~~~"
+                       msg "~~~~~~~~,/  \`---.....-'~~W~~~~"
+                       msg "~~~~~~,/   \\_____/_\\_W~~/~~~~~"
+                       msg "~~~~~/          /~~~\\__/~~~~~~"
+                       msg "~~~~/          /~~~~~~~~~~~~~~"
+                       msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+                       msg "~~~~~~~ Y U NO COMPILE ~~~~~~~"
+                       msg "~~~~~~~~~~~~ CODE ~~~~~~~~~~~~"
+                       msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+                       msg ""
+                       exit 1
+               fi
+               rm -f conftest
+
                verbose cd "$d0/d0_blind_id"
                if ! $compiled0; then
                        # compilation of crypto library failed
@@ -1639,8 +1668,8 @@ case "$cmd" in
                rm -f Xonotic/key_15.d0pk
                {
                        verbose cd Xonotic/mapping
-                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2
-                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819.tar.bz2
+                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe
                        for X in *-7z.exe; do
                                7za x "$X"
                                rm -f "$X"
@@ -1858,7 +1887,7 @@ case "$cmd" in
                                        versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
-                       if [ $gv -lt 900 ]; then
+                       if [ $gv -lt 9900 ]; then
                                # pre-1.0: compatible with any other pre-1.0
                                verbose sed "
                                        s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;