]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
slightly improved text
[xonotic/xonotic.git] / all
diff --git a/all b/all
index be7c976af7bb84c355a2baab43547f4790e3dc92..100fb75ab76882bf201109245c7cc9f7ef93fc3f 100755 (executable)
--- a/all
+++ b/all
@@ -6,6 +6,7 @@ set -e
 # I use this in EVERY shell script ;)
 LF="
 "
+ESC="\e"
 
 d00=`pwd`
 while ! [ -f ./all ]; do
@@ -35,7 +36,7 @@ esac
 
 msg()
 {
-       echo >&2 "\e[1m$*\e[m"
+       echo >&2 "$ESC[1m$*$ESC[m"
 }
 
 self=`git hash-object "$SELF"`
@@ -341,7 +342,7 @@ case "$cmd" in
                        pushurl=`repopushurl "$d"`
                        branch=`repobranch "$d"`
                        if [ -d "$d0/$d" ]; then
-                               enter "$d0/$d" verbose
+                               verbose cd "$d0/$d"
                                fix_git_config "$url" "$pushurl"
                                cd "$d0"
                        fi
@@ -573,38 +574,47 @@ case "$cmd" in
                done
                ;;
        compile)
+               cleandp=false
+               cleanqcc=false
+               cleanqc=false
+               debug=debug
                if [ -z "$CC" ]; then
                        export CC="gcc -DSUPPORTIPV6"
                fi
+               while :; do
+                       case "$1" in
+                               -c)
+                                       cleandp=true
+                                       cleanqcc=true
+                                       cleanqc=true
+                                       shift
+                                       ;;
+                               -r)
+                                       debug=release
+                                       export CC="$CC -g -mtune=native -march=native"
+                                       shift
+                                       ;;
+                               *)
+                                       break
+                                       ;;
+                       esac
+               done
                if [ -n "$WE_HATE_OUR_USERS" ]; then
-                       TARGETS="sv-debug cl-debug"
+                       TARGETS="sv-$debug cl-$debug"
                elif [ x"`uname`" = x"Darwin" ]; then
                        case "`uname -r`" in
                                ?.*)
-                                       TARGETS="sv-debug cl-debug sdl-debug"
+                                       TARGETS="sv-$debug cl-$debug sdl-$debug"
                                        ;;
                                *)
                                        # AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
-                                       TARGETS="sv-debug sdl-debug"
+                                       TARGETS="sv-$debug sdl-$debug"
                                        ;;
                        esac
                        export CC="$CC -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                else
-                       TARGETS="sv-debug cl-debug sdl-debug"
+                       TARGETS="sv-$debug cl-$debug sdl-$debug"
                fi
-               case "$1" in
-                       -c)
-                               cleandp=true
-                               cleanqcc=true
-                               cleanqc=true
-                               shift
-                               ;;
-                       *)
-                               cleandp=false
-                               cleanqcc=false
-                               cleanqc=false
-                               ;;
-               esac
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
                        # if we give the command make the arg "", it will surely fail (invalid filename),
                        # so better handle it as an empty client option
@@ -669,7 +679,7 @@ case "$cmd" in
                        verbose make $MAKEFLAGS clean
                fi
                for T in $TARGETS; do
-                       verbose make $MAKEFLAGS "$@" "$T"
+                       verbose make $MAKEFLAGS STRIP=: "$@" "$T"
                done
                for T in $BAD_TARGETS; do
                        echo "Warning: discarded invalid client $T."
@@ -1067,6 +1077,8 @@ case "$cmd" in
                                                verbose git branch -D "${B#refs/heads/}"
                                        fi
                                done
+                               git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch -t master origin/master || true
+                               git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch -t "`repobranch "$d"`" origin/"`repobranch "$d"`" || true
                        fi
                done
                ;;
@@ -1082,7 +1094,45 @@ case "$cmd" in
                                msg "Building a RELEASE"
                                ;;
                        *)
-                               msg "Must either set RELEASETYPE=beta or RELEASETYPE=release"
+                               echo >&2 -n "$ESC[2J$ESC[H"
+                               msg ""
+                               msg ""
+                               msg ""
+                               msg ""
+                               msg ""
+                               msg ""
+                               msg "        +---------------------------------------------------------.---+"
+                               msg "        | NOTE                                                    | X |"
+                               msg "        +---------------------------------------------------------^---+"
+                               msg "        |   ____                                                      |"
+                               msg "        |  /    \  This is the official release build system.         |"
+                               msg "        | |      | If you are not a member of the Xonotic Core Team,  |"
+                               msg "        | | STOP | you are not supposed to use this script and should |"
+                               msg "        | |      | instead use ./all compile to compile the engine    |"
+                               msg "        |  \____/  and game code.                                     |"
+                               msg "        |                                                             |"
+                               msg "        |                      [ I understand ]                       |"
+                               msg "        +-------------------------------------------------------------+"
+                               sleep 10
+                               # A LOT of build infrastructure is required:
+                               # - vorbis-tools
+                               # - ImageMagick
+                               # - .ssh/config must be configured so the following
+                               #   host names are reachable and have a compile
+                               #   infrastructure set up:
+                               #   - xonotic-build-linux32 (with gcc on x86)
+                               #   - xonotic-build-linux64 (with gcc on x86_64)
+                               #   - xonotic-build-win32 (with i586-mingw32msvc-g++)
+                               #   - xonotic-build-win64 (with amd64-mingw32msvc-g++
+                               #     and x86_64-w64-mingw32-g++)
+                               #   - xonotic-build-osx (with Xcode and SDL.framework)
+                               # - AMD Compressonator installed in WINE
+                               # - ResEdit installed in WINE
+                               # - a lot of other requirements you will figure out
+                               #   while reading the error messages
+                               # - environment variable RELEASETYPE set
+                               # - optionally, environment variable RELEASEDATE set
+                               #   (YYYYMMDD)
                                exit 1
                                ;;
                esac
@@ -1192,7 +1242,7 @@ case "$cmd" in
                ;;
        release-engine-win32)
                verbose "$SELF" release-compile win32 \
-                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+                       'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DUSE_WSPIAPI_H -DSUPPORTIPV6" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
                        win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
                        '' ''
                verbose "$SELF" release-compile win32 \
@@ -1223,7 +1273,7 @@ case "$cmd" in
                ;;
        release-engine-linux32)
                verbose "$SELF" release-compile linux32 \
-                       'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+                       'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
                        all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
                        release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
                ;;