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 166f4caed867f2b0699f72ec44d2077c651a702a..fc966598fc79f6f975f306999a8e6c5ae0f7b008 100755 (executable)
--- a/all
+++ b/all
@@ -380,6 +380,10 @@ fix_upstream_rebase_mergefail()
 
 fix_git_config()
 {
+       if ! [ -f ".git/config" ]; then
+               $ECHO "Not a git repository. Bailing out to not cause damage."
+               exit 1
+       fi
        verbose git config remote.origin.url "$1"
        if [ -n "$2" ]; then
                verbose git config remote.origin.pushurl "$2"
@@ -516,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"
@@ -694,7 +698,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
                                # if we have .no file, skip
                                if [ -f "$d0/$d.no" ]; then
                                        msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated"
@@ -722,6 +726,14 @@ case "$cmd" in
                                        cd "$d0"
                                fi
                        else
+                               if [ -d "$d0/$d" ]; 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."
+                                               continue
+                                       fi
+                               fi
                                verbose git clone "$url" "$d0/$d"
                                enter "$d0/$d" verbose
                                fix_git_config "$url" "$pushurl"
@@ -951,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
@@ -1021,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
@@ -1031,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
@@ -1627,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-20110223.tar.bz2
-                       verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110223-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"
@@ -1846,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 /;
@@ -1946,6 +1987,7 @@ case "$cmd" in
                fi
                # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
+                       Xonotic/*.dll \
                        Xonotic/bin32/*.dll \
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
@@ -1976,6 +2018,8 @@ case "$cmd" in
                        Xonotic/data/xonotic-$stamp-maps-low.pk3 \
                        Xonotic/data/xonotic-$stamp-music-low.pk3
                verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+               verbose mkzip Xonotic-$stamp-high.zip \
+                       Xonotic/mapping
                verbose mkzip0 Xonotic-$stamp-high.zip \
                        Xonotic/data/xonotic-$stamp-data-high.pk3 \
                        Xonotic/data/xonotic-$stamp-maps-high.pk3 \
@@ -1984,7 +2028,7 @@ case "$cmd" in
                verbose mkzip Xonotic-$stamp-mappingsupport.zip \
                        Xonotic/mapping
                verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \
-                       Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build
+                       Xonotic/data/xonotic-$stamp-maps-low.pk3
                ;;
        release)
                verbose "$SELF" release-prepare
@@ -2005,13 +2049,12 @@ case "$cmd" in
                $ECHO "  $SELF checkout|switch <remote>/<branch>"
                $ECHO "  $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]"
                $ECHO "  $SELF clean --reclone"
-               $ECHO "  $SELF compile [-c] [-r|-p] [-0]"
+               $ECHO "  $SELF compile [-c] [-r|-p] [-0] [sdl|glx|wgl|agl|dedicated]"
                $ECHO "  $SELF each|foreach [-k] command..."
                $ECHO "  $SELF fix_upstream_rebase"
                $ECHO "  $SELF keygen"
                $ECHO "  $SELF merge"
                $ECHO "  $SELF push|commit [-s]"
-               $ECHO "  $SELF release"
                $ECHO "  $SELF restore-patches"
                $ECHO "  $SELF run [sdl|glx|wgl|agl|dedicated] options..."
                $ECHO "  $SELF save-patches"