X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=all;h=9cc6fb28d5b7ed7ce101d9168cef6777b7debd83;hb=6bdf18d27c75651cbaa3746761b026d51d11d965;hp=a4d195484e8d40245bd4b135b64a0c2ddcd213d9;hpb=87a39db1a58fe7f801c51b6721515fa8e4a55251;p=xonotic%2Fxonotic.git diff --git a/all b/all index a4d19548..9cc6fb28 100755 --- a/all +++ b/all @@ -6,6 +6,7 @@ set -e # I use this in EVERY shell script ;) LF=" " +ESC="" d00=`pwd` while ! [ -f ./all ]; do @@ -35,7 +36,7 @@ esac msg() { - echo >&2 "$*" + echo >&2 "$ESC[1m$*$ESC[m" } self=`git hash-object "$SELF"` @@ -116,10 +117,10 @@ data/xonotic-nexcompat.pk3dir | darkplaces | | div0-stable | svn netradiant | | master | div0-gittools | | master | no -d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | +d0_blind_id | git://github.com/divVerent/d0_blind_id.git | master | data/xonotic-maps.pk3dir | | master | mediasource | | master | no -fteqcc | http://github.com/Blub/qclib.git | master | +fteqcc | git://github.com/Blub/qclib.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -135,6 +136,18 @@ case "$base" in exit 1 ;; esac +pushbase=`git config remote.origin.pushurl || true` +case "$pushbase" in + */xonotic.git) + pushbase=${pushbase%xonotic.git} + ;; + '') + ;; + *) + echo "The main repo is not xonotic.git, what have you done?" + exit 1 + ;; +esac repourl() { @@ -157,6 +170,27 @@ repourl() fi } +repopushurl() +{ + [ -n "$pushbase" ] || return 0 + repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` + if [ -n "$repo_t" ]; then + case "$repo_t" in + *://*) + ;; + *) + echo "$pushbase$repo_t" + ;; + esac + else + if [ x"$1" = x"." ]; then + echo "$pushbase""xonotic.git" + else + echo "$pushbase${1##*/}.git" + fi + fi +} + repobranch() { repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` @@ -267,6 +301,13 @@ fix_upstream_rebase_mergefail() fix_git_config() { + verbose git config remote.origin.url "$1" + if [ -n "$2" ]; then + verbose git config remote.origin.pushurl "$2" + else + verbose git config --unset remote.origin.pushurl || true + fi + verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" verbose git config core.autocrlf input if [ -z "`git config push.default`" ]; then verbose git config push.default current # or is tracking better? @@ -296,20 +337,113 @@ case "$cmd" in verbose fix_upstream_rebase_mergefail && verbose fix_upstream_rebase_mergeok done ;; + fix_config) + for d in $repos; do + url=`repourl "$d"` + pushurl=`repopushurl "$d"` + branch=`repobranch "$d"` + if [ -d "$d0/$d" ]; then + verbose cd "$d0/$d" + fix_git_config "$url" "$pushurl" + cd "$d0" + fi + done + ;; + keygen) + # enable the ssh URL for pushing + "$SELF" update -N -p + + if [ -f ~/.ssh/id_rsa.pub ]; then + msg "" + msg "A key already exists and no new one will be generated. If you" + msg "already have done the procedure for getting your key approved, you" + msg "can skip the following paragraph and already use the repository." + msg "" + msg "To get access, your key has to be approved first. For that, visit" + msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on" + msg "the \"Support\" tracker in the \"Repository\" category where you" + msg "apply for access and paste the following output into the issue:" + msg "" + msg "`cat ~/.ssh/id_rsa.pub`" + msg "" + msg "Note that you will only have write access to branches that start" + msg "with your user name." + elif [ -f ~/.ssh/id_dsa.pub ]; then + msg "" + msg "A key already exists and no new one will be generated. If you" + msg "already have done the procedure for getting your key approved, you" + msg "can skip the following paragraph and already use the repository." + msg "" + msg "To get access, your key has to be approved first. For that, visit" + msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on" + msg "the \"Support\" tracker in the \"Repository\" category where you" + msg "apply for access and paste the following output into the issue:" + msg "" + msg "`cat ~/.ssh/id_dsa.pub`" + msg "" + msg "Note that you will only have write access to branches that start" + msg "with your user name." + else + msg "" + msg "No key has been generated yet. One will be generated now." + msg "If other people are using your computer, it is recommended" + msg "to specify a passphrase. Otherwise you can simply hit ENTER" + msg "when asked for a passphrase." + msg "" + ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa + msg "" + msg "To get access, your key has to be approved first. For that, visit" + msg "http://dev.xonotic.org/, then log in, create a \"New Issue\" on" + msg "the \"Support\" tracker in the \"Repository\" category where you" + msg "apply for access and paste the following output into the issue:" + msg "" + msg "`cat ~/.ssh/id_rsa.pub`" + msg "" + msg "Note that you will only have write access to branches that start" + msg "with your user name." + fi + ;; update|pull) allow_pull=true - if [ x"$1" = x"-N" ]; then - allow_pull=false + fix_config=false + while :; do + if [ x"$1" = x"-N" ]; then + allow_pull=false + elif [ x"$1" = x"-p" ]; then + fix_config=true + if [ x"$base" != x"ssh://xonotic@git.xonotic.org/" ]; then + pushbase=ssh://xonotic@git.xonotic.org/ + fi + elif [ x"$1" = x"-s" ]; then + fix_config=true + base=ssh://xonotic@git.xonotic.org/ + pushbase= + elif [ x"$1" = x"-g" ]; then + fix_config=true + base=git://git.xonotic.org/xonotic/ + elif [ x"$1" = x"-h" ]; then + fix_config=true + base=http://git.xonotic.org/xonotic/ + else + break + fi + shift + done + if $fix_config; then + url=`repourl .` + pushurl=`repopushurl .` + fix_git_config "$url" "$pushurl" + fi + if $allow_pull || $fix_config; then + "$SELF" fix_config fi for d in $repos; do url=`repourl "$d"` + pushurl=`repopushurl "$d"` branch=`repobranch "$d"` if [ -d "$d0/$d" ]; then if $allow_pull; then enter "$d0/$d" verbose - fix_git_config - verbose git config remote.origin.url "$url" - verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then @@ -332,7 +466,7 @@ case "$cmd" in else verbose git clone "$url" "$d0/$d" enter "$d0/$d" verbose - fix_git_config + fix_git_config "$url" "$pushurl" if [ "$branch" != "master" ]; then verbose git checkout --track -b "$branch" origin/"$branch" fi @@ -521,40 +655,53 @@ case "$cmd" in done ;; compile) + cleand0=false + cleandp=false + cleanqcc=false + cleanqc=false + compiled0=false + debug=debug + if [ -z "$CC" ]; then + export CC="gcc -DSUPPORTIPV6" + fi + while :; do + case "$1" in + -0) + compiled0=true + ;; + -c) + cleand0=true + 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" - if [ -z "$CC" ]; then - export CC=gcc - fi + 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="gcc -I$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks/SDL.framework/Headers -F$PWD/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" + 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) - cleand0=true - cleandp=true - cleanqcc=true - cleanqc=true - shift - ;; - *) - cleand0=false - 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 @@ -600,14 +747,53 @@ case "$cmd" in fi enter "$d0/d0_blind_id" verbose - if ! [ -f Makefile ]; then - verbose sh autogen.sh - verbose ./configure + if ! $compiled0; then + # compilation of crypto library failed + # use binaries then, if we can... + mkdir -p .libs + if [ -n "$WE_HATE_OUR_USERS" ]; then + verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/ + verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/ + else + case "`uname`" in + Linux) + case `uname -m` in + x86_64) + verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/ + verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/" + ;; + *86) + verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/ + verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/" + ;; + *) + compiled0=true + ;; + esac + ;; + Darwin) + verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/ + ;; + *) + compiled0=true + ;; + esac + fi fi - if $cleand0; then - verbose make $MAKEFLAGS clean + if $compiled0; then + if $cleand0; then + if [ -f Makefile ]; then + verbose make $MAKEFLAGS distclean + fi + fi + if ! [ -f Makefile ]; then + verbose sh autogen.sh + verbose ./configure + fi + verbose make $MAKEFLAGS fi - verbose make $MAKEFLAGS enter "$d0/fteqcc" verbose if $cleanqcc; then @@ -617,9 +803,10 @@ case "$cmd" in enter "$d0/data/xonotic-data.pk3dir" verbose if $cleanqc; then - verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean + verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean fi - verbose make FTEQCC="$d0/fteqcc/fteqcc.bin" "$@" $MAKEFLAGS + verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS + # 4 levels up: data, xonotic-data, qcsrc, server enter "$d0/darkplaces" verbose if [ x"$BAD_TARGETS" = x" " ]; then @@ -629,7 +816,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." @@ -924,6 +1111,8 @@ case "$cmd" in echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt ;; clean) + "$SELF" fix_config + "$SELF" update -N force=false gotoupstream=false fetchupstream=false @@ -1026,6 +1215,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 ;; @@ -1041,7 +1232,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 @@ -1153,7 +1382,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 \ @@ -1184,7 +1413,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 DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ + '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 DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \ 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' ;; @@ -1213,10 +1442,10 @@ case "$cmd" in release-qc) case "$RELEASETYPE" in beta) - verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all + verbose make -C Xonotic/source FTEQCC="../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all ;; release) - verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all + verbose make -C Xonotic/source FTEQCC="../fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all ;; esac verbose rm -f Xonotic/source/*/fteqcc.log @@ -1436,9 +1665,10 @@ case "$cmd" in echo " $SELF checkout|switch /" echo " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]" echo " $SELF clean --reclone" - echo " $SELF compile [-c]" + echo " $SELF compile [-c] [-r] [-0]" 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" @@ -1446,6 +1676,6 @@ case "$cmd" in echo " $SELF run [sdl|glx|wgl|agl|dedicated] options..." echo " $SELF save-patches" echo " $SELF update-maps" - echo " $SELF update|pull [-N]" + echo " $SELF update|pull [-N] [-s | -h [-p] | -g [-p]]" ;; esac