]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
more text
[xonotic/xonotic.git] / all
diff --git a/all b/all
index 9920ed88b53a27fb7621717c687adeee212fb0ad..262587674ad4d7b6bbf97d633ca5d02e5e0b9ace 100755 (executable)
--- a/all
+++ b/all
@@ -117,7 +117,7 @@ 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                        | git://github.com/Blub/qclib.git                   | master      |
@@ -349,12 +349,92 @@ case "$cmd" in
                        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 ticket:"
+                       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 ticket:"
+                       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
+                       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 ticket:"
+                       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; then
+               if $allow_pull || $fix_config; then
                        "$SELF" fix_config
                fi
                for d in $repos; do
@@ -579,12 +659,16 @@ case "$cmd" in
                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
@@ -663,14 +747,53 @@ case "$cmd" in
                fi
 
                enter "$d0/d0_blind_id" verbose
-               if $cleand0; then
-                       verbose make $MAKEFLAGS distclean
+               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 ! [ -f Makefile ]; then
-                       verbose sh autogen.sh
-                       verbose ./configure
+               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