From: Rudolf Polzer Date: Fri, 8 Oct 2010 19:45:54 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~21 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=54d203c9b171a752a11f3e00bedb8420438b26c0;hp=-c Merge branch 'master' into divVerent/crypto2 Conflicts: all --- 54d203c9b171a752a11f3e00bedb8420438b26c0 diff --combined all index 12d312af,282a6903..38c19007 --- a/all +++ b/all @@@ -116,7 -116,6 +116,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 | data/xonotic-maps.pk3dir | | master | mediasource | | master | no fteqcc | http://github.com/Blub/qclib.git | master | @@@ -135,6 -134,18 +135,18 @@@ case "$base" i 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 -168,27 +169,27 @@@ 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 -299,13 +300,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 -335,33 +336,33 @@@ case "$cmd" i 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 + ;; update|pull) allow_pull=true if [ x"$1" = x"-N" ]; then allow_pull=false fi + if $allow_pull; 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 -384,7 +385,7 @@@ 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 -573,46 +574,48 @@@ done ;; compile) ++ cleand0=false + cleandp=false + cleanqcc=false + cleanqc=false + debug=debug + while :; do + case "$1" in + -c) ++ cleand0=true + cleandp=true + cleanqcc=true + cleanqc=true + shift + ;; + -r) + debug=release + shift + ;; + *) + break + ;; + esac + done if [ -z "$CC" ]; then - export CC="gcc -DSUPPORT_IPV6" + export CC="gcc -DSUPPORTIPV6" fi 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) - 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 @@@ -599,16 -657,6 +660,16 @@@ fi fi + enter "$d0/d0_blind_id" verbose + if ! [ -f Makefile ]; then + verbose sh autogen.sh + verbose ./configure + fi + if $cleand0; then + verbose make $MAKEFLAGS clean + fi + verbose make $MAKEFLAGS + enter "$d0/fteqcc" verbose if $cleanqcc; then verbose make $MAKEFLAGS clean @@@ -640,13 -688,12 +701,13 @@@ run) if [ -n "$WE_HATE_OUR_USERS" ]; then client= - export PATH="$d0/misc/buildfiles/win32:$PATH" + export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH" elif [ x"`uname`" = x"Darwin" ]; then - export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS" + export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs" export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks" client=-sdl else + export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs" client=-sdl fi case "$1" in @@@ -924,6 -971,8 +985,8 @@@ 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 @@@ -1052,7 -1101,7 +1115,7 @@@ else verbose date +%Y%m%d > Xonotic/stamp.txt fi - verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | { + verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles key_0.d0pk | { verbose cd Xonotic verbose mkdir data fteqcc source source/darkplaces source/fteqcc verbose tar xvf - @@@ -1061,7 -1110,6 +1124,7 @@@ verbose mv misc/buildfiles/win64 bin64 || true verbose mv misc/buildfiles/osx/* . || true verbose rm -rf misc/buildfiles + verbose rm -rf misc/pki } { verbose cd darkplaces @@@ -1084,7 -1132,6 +1147,7 @@@ verbose cd Xonotic/source verbose tar xvf - } + rm -f Xonotic/key_15.d0pk ;; release-compile-run) host=$1 @@@ -1184,13 -1231,13 +1247,13 @@@ ;; 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 -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' ;; release-engine-linux64) verbose "$SELF" release-compile linux64 \ - 'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \ + 'STRIP=: CC="gcc -m64 -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.linux64' \ release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated' ;; @@@ -1369,14 -1416,7 +1432,14 @@@ stamp=`cat Xonotic/stamp.txt` # exe and dll files do not need +x, so this makes them eligible for 7zip compression too chmod a-x Xonotic/*.exe Xonotic/*.dll || true - # need to use infozip for these (+x bits) + # let's pass crypto import laws of some nasty countries + crypto_libs=`find Xonotic -name \*d0_rijndael\*` + if [ -n "$crypto_libs" ]; then + verbose mkzip Xonotic-$stamp-crypto.zip \ + $crypto_libs + rm -f $crypto_libs + fi + # build the archives verbose mkzip Xonotic-$stamp-engine.zip \ Xonotic/*.dll \ Xonotic/bin64/*.dll \ @@@ -1392,7 -1432,6 +1455,7 @@@ Xonotic/misc \ Xonotic/fteqcc \ Xonotic/server \ + Xonotic/key_0.d0pk \ Xonotic/data/font-nimbussansl-$stamp.pk3 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip verbose mkzip0 Xonotic-$stamp.zip \