X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=7ec990f87f04c4dfdd8f4d26cdf0c958a5a1fea7;hp=92e54cb670930d9b231776c240fd3f50169c2dad;hb=9ae4b7a956181ed08edd87cf3aa81f00f105e236;hpb=9f16090cb3dca3aeabf41a275d5d49e4edc0b2e3 diff --git a/all b/all index 92e54cb6..7ec990f8 100755 --- a/all +++ b/all @@ -2,16 +2,27 @@ # vim: filetype=zsh set -e +if [ -n "$ZSH_VERSION" ]; then + setopt SH_WORD_SPLIT +fi +if [ -z "$ECHO" ]; then + if echo "\\\\" | grep .. >/dev/null; then + ECHO=echo + else + ECHO=`which echo` + fi +fi # I use this in EVERY shell script ;) LF=" " +ESC="" d00=`pwd` while ! [ -f ./all ]; do if [ x"`pwd`" = x"/" ]; then - echo "Cannot find myself." - echo "Please run this script with the working directory inside a Xonotic checkout." + $ECHO "Cannot find myself." + $ECHO "Please run this script with the working directory inside a Xonotic checkout." exit 1 fi cd .. @@ -35,7 +46,7 @@ esac msg() { - echo >&2 "$*" + $ECHO >&2 "$ESC""[1m$*$ESC""[m" } self=`git hash-object "$SELF"` @@ -66,10 +77,10 @@ visible_repo_name() { case "$1" in .) - echo "the root directory" + $ECHO "the root directory" ;; *) - echo "\"$1\"" + $ECHO "\"$1\"" ;; esac } @@ -77,16 +88,16 @@ visible_repo_name() check_mergeconflict() { if git ls-files -u | grep ' 1 '; then - echo - echo "MERGE CONFLICT." - echo "change into the \"$1\" project directory, and then:" - echo "- edit the files mentioned above with your favorite editor," - echo " and fix the conflicts (marked with <<<<<<< blocks)" - echo "- for binary files, you can select the files using" - echo " git checkout --ours or git checkout --theirs" - echo "- when done with a file, 'git add' the file" - echo "- when done, 'git commit'" - echo + $ECHO + $ECHO "MERGE CONFLICT." + $ECHO "change into the \"$1\" project directory, and then:" + $ECHO "- edit the files mentioned above with your favorite editor," + $ECHO " and fix the conflicts (marked with <<<<<<< blocks)" + $ECHO "- for binary files, you can select the files using" + $ECHO " git checkout --ours or git checkout --theirs" + $ECHO "- when done with a file, 'git add' the file" + $ECHO "- when done, 'git commit'" + $ECHO exit 1 fi } @@ -96,7 +107,7 @@ yesno() yesno= while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do eval "$2" - echo "$1" + $ECHO "$1" IFS= read -r yesno done [ x"$yesno" = x"y" ] @@ -109,20 +120,21 @@ enter() } repos_urls=" -. | | master | -data/xonotic-data.pk3dir | | master | -data/xonotic-maps.pk3dir | | master | -data/xonotic-music.pk3dir | | master | -data/xonotic-nexcompat.pk3dir | | master | -mediasource | | master | -darkplaces | | div0-stable | svn -fteqcc | git://github.com/Blub/qclib.git | master | -div0-gittools | | master | -netradiant | | master | +. | | master | +data/xonotic-data.pk3dir | | master | +data/xonotic-music.pk3dir | | master | +data/xonotic-nexcompat.pk3dir | | master | no +darkplaces | | div0-stable | svn +netradiant | | master | +div0-gittools | | master | no +d0_blind_id | | master | +data/xonotic-maps.pk3dir | | master | +mediasource | | master | no +fteqcc | | xonotic-stable | noautocrlf " # todo: in darkplaces, change repobranch to div0-stable -repos=`echo "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '` +repos=`$ECHO "$repos_urls" | grep . | cut -d '|' -f 1 | tr -d ' '` base=`git config remote.origin.url` case "$base" in @@ -130,53 +142,121 @@ case "$base" in base=${base%xonotic.git} ;; *) - echo "The main repo is not xonotic.git, what have you done?" + $ECHO "The main repo is not xonotic.git, what have you done?" + 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() { - repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` + repo_t=`$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 2 | tr -d ' '` + if [ -n "$repo_t" ]; then + case "$repo_t" in + *://*) + $ECHO "$repo_t" + ;; + *) + $ECHO "$base$repo_t" + ;; + esac + else + if [ x"$1" = x"." ]; then + $ECHO "$base""xonotic.git" + else + $ECHO "$base${1##*/}.git" + fi + 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 "$repo_t" ;; *) - echo "$base$repo_t" + $ECHO "$pushbase$repo_t" ;; esac else if [ x"$1" = x"." ]; then - echo "$base""xonotic.git" + $ECHO "$pushbase""xonotic.git" else - echo "$base${1##*/}.git" + $ECHO "$pushbase${1##*/}.git" fi fi } repobranch() { - repo_t=`echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` + repo_t=`$ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 3 | tr -d ' '` if [ -n "$repo_t" ]; then - echo "$repo_t" + $ECHO "$repo_t" else - echo "master" + $ECHO "master" fi } repoflags() { - echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' + $ECHO "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' ' } -repos=`for d in $repos; do - p="${d%dir}" - if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then - echo "$d" - fi -done` +listrepos() +{ + for d in $repos; do + p="${d%dir}" + f="`repoflags "$d"`" + # if we have the dir, always keep it + if [ -d "$d" ]; then + msg "Repository $d enabled because it already exists" + $ECHO "$d" + continue + fi + # if .yes file exists, always keep it + if [ -f "$d.yes" ]; then + msg "Repository $d enabled by a .yes file" + $ECHO "$d" + continue + fi + # if we have .no file, skip + if [ -f "$d.no" ]; then + msg "Repository $d disabled by a .no file, delete $p.no to enable" + continue + fi + # if we have matching pk3, skip + if [ x"$p" != x"$d" ] && [ -f "$p" ]; then + msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable" + continue + fi + # if "no" flag is set, skip + case ",$f," in + *,no,*) + msg "Repository $d disabled by default, create $d.yes to enable" + continue + ;; + esac + # default: enable + msg "Repository $d enabled by default" + $ECHO "$d" + done +} + +repos=`listrepos` if [ "$#" = 0 ]; then set -- help @@ -198,9 +278,9 @@ fix_upstream_rebase() r_l_other=`git log --pretty="format:%s" "$r_me".."$r_other" | grep -v "^Merge" | sort -u` # heuristics: upstream rebase/filter-branch if more than 50% of the commits of one of the sides are in the other too - r_lc_me=`echo "$r_l_me" | wc -l` - r_lc_other=`echo "$r_l_other" | wc -l` - r_lc_together=`{ echo "$r_l_me"; echo "$r_l_other"; } | sort -u | wc -l` + r_lc_me=`$ECHO "$r_l_me" | wc -l` + r_lc_other=`$ECHO "$r_l_other" | wc -l` + r_lc_together=`{ $ECHO "$r_l_me"; $ECHO "$r_l_other"; } | sort -u | wc -l` r_lc_same=$(($r_lc_me + $r_lc_other - $r_lc_together)) if [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_me )) ] || [ $(( $r_lc_same * 2 )) -gt $(( $r_lc_other )) ]; then @@ -229,6 +309,87 @@ fix_upstream_rebase_mergefail() fix_upstream_rebase } +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/*" + case ",`repoflags "$d"`," in + *,noautocrlf,*) + verbose git config --unset core.autocrlf || true + ;; + *) + verbose git config core.autocrlf input + ;; + esac + if [ -z "`git config push.default || true`" ]; then + verbose git config push.default current # or is tracking better? + fi + verbose git config filter.mapclean.clean "tr -d '\r' | grep '^[^/]'" + verbose git config filter.mapclean.smudge "cat" +} + +mkzip() +{ + archive=$1 + shift + ziplist=`mktemp` + find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist" + 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true + zip -9y -@<"$ziplist" "$archive" || true + rm -f "$ziplist" +} + +mkzip0() +{ + zip -0y "$@" +} + +mirrorspeed() +{ + # first result is to be ignored, but we use it to check status + git ls-remote "$1" refs/heads/master >/dev/null 2>&1 || return 1 + { time -p git ls-remote "$1" refs/heads/master; } 2>&1 >/dev/null | head -n 1 | cut -d ' ' -f 2 | tr -d . | sed 's,^0*,,' + # unit: clock ticks (depends on what "time" returns +} + +bestmirror() +{ + pre=$1; shift + suf=$1; shift + + if ! { time -p true; } >/dev/null 2>&1; then + return 1 + fi + + bestin= + bestt= + for in in "$@"; do + m=$pre$in$suf + if t=`mirrorspeed "$m"`; then + msg "$m -> $t ticks" + if [ -n "$t" ]; then + if [ -z "$bestt" ] || [ "$t" -lt "$bestt" ]; then + bestin=$in + bestt=$t + fi + fi + else + msg "$m -> FAIL" + fi + done + if [ -n "$bestin" ]; then + msg "Best mirror seems to be $pre$bestin$suf" + $ECHO "$bestin" + else + return 1 + fi +} + case "$cmd" in fix_upstream_rebase) for d in $repos; do @@ -236,29 +397,180 @@ 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 + location=current + 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/ + elif [ x"$1" = x"-l" ]; then + case "$2" in + nl) ;; + de) ;; + best) ;; + default) ;; + *) + msg "Invalid location!" + msg "Possible locations for the -l option:" + msg " nl (Netherlands, run by merlijn)" + msg " de (Germany, run by divVerent)" + msg " best (find automatically)" + msg " default (currently nl)" + exit 1 + ;; + esac + fix_config=true + location=$2 + shift + else + break + fi + shift + done + case "$location" in + best) + newbase=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,:// .git.xonotic.org/,"` + case "$newbase" in + *\ *) + if location=`bestmirror $newbase"xonotic.git" de nl`; then + : + else + location=current + fi + ;; + *) + location=current + ;; + esac + ;; + esac + case "$location" in + default) + location= + ;; + current) + case "$base" in + *://*.git.xonotic.org/*) + location=${base%%.git.xonotic.org/*} + location=${location##*://} + ;; + *) + location= + ;; + esac + ;; + esac + if [ -n "$location" ]; then + base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"` + pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"` + else + base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"` + pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"` + fi + 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 - verbose git config remote.origin.url "$url" - verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" - - verbose git config core.autocrlf input - r=`git symbolic-ref HEAD` r=${r#refs/heads/} if git config branch.$r.remote >/dev/null 2>&1; then if ! verbose git pull; then fix_upstream_rebase_mergefail || true check_mergeconflict "$d" - echo "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." + $ECHO "Pulling failed. Press ENTER to continue, or Ctrl-C to abort." read -r DUMMY else fix_upstream_rebase_mergeok || true @@ -274,6 +586,7 @@ case "$cmd" in else verbose git clone "$url" "$d0/$d" enter "$d0/$d" verbose + fix_git_config "$url" "$pushurl" if [ "$branch" != "master" ]; then verbose git checkout --track -b "$branch" origin/"$branch" fi @@ -323,7 +636,7 @@ case "$cmd" in exists=true verbose git checkout $checkoutflags --track -b "$b" "$remote/$b" else - echo "WTF? Not even branch $b doesn't exist in $d" + $ECHO "WTF? Not even branch $b doesn't exist in $d" exit 1 fi fi @@ -332,7 +645,7 @@ case "$cmd" in cd "$d0" done if ! $exists; then - echo "The requested branch was not found in any repository." + $ECHO "The requested branch was not found in any repository." fi exec "$SELF" branch ;; @@ -349,7 +662,7 @@ case "$cmd" in enter "$d0/$d" r=`git symbolic-ref HEAD` r=${r#refs/heads/} - echo "$d is at $r" + $ECHO "$d is at $r" cd "$d0" done else @@ -357,7 +670,7 @@ case "$cmd" in dv=`visible_repo_name "$d"` enter "$d0/$d" verbose if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then - echo "Already having this branch in $dv." + $ECHO "Already having this branch in $dv." else if yesno "Branch in $dv?"; then if [ -n "$srcbranch" ]; then @@ -380,48 +693,30 @@ case "$cmd" in branches) for d in $repos; do cd "$d0/$d" # am in a pipe, shouldn't use enter - git branch -a -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ," + git branch -r -v -v | cut -c 3- | sed "s/^(no branch)/(no_branch)/" | sed "s,^,$d ," cd "$d0" done | { branches_list= # branches_repos_*= - while read -r d BRANCH REV UPSTREAM TEXT; do + while read -r d BRANCH REV TEXT; do if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then continue fi - case "$UPSTREAM" in - \[*) - UPSTREAM=${UPSTREAM#\[} - UPSTREAM=${UPSTREAM%\]} - UPSTREAM=${UPSTREAM%:*} - ;; - *) - TEXT="$UPSTREAM $TEXT" - UPSTREAM= - ;; - esac if [ x"$REV" = x"->" ]; then continue fi BRANCH=${BRANCH#remotes/} - ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"` + ID=`$ECHO "$BRANCH" | tr -c "A-Za-z0-9." "_"` branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ eval "r=\$branches_repos_$ID" - case "$UPSTREAM" in - '') - r="$r $d" - ;; - *) - r="$r $d:$UPSTREAM" - ;; - esac + r="$r $d" eval "branches_repos_$ID=\$r" done - echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do - ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"` + $ECHO -n "$branches_list" | xargs -n 1 $ECHO | sort -u | while IFS= read -r BRANCH; do + ID=`$ECHO "$BRANCH" | tr -c "A-Za-z0-9." "_"` eval "r=\$branches_repos_$ID" printf "%-60s %s\n" "$BRANCH" "$r" - #echo "$BRANCH: $r" + #$ECHO "$BRANCH: $r" done } ;; @@ -453,19 +748,19 @@ case "$cmd" in diffdata=`git diff --color HEAD` if [ -n "$diffdata" ]; then # we have uncommitted changes - if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then + if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" '$ECHO "$diffdata" | less -r'; then verbose git commit -a fi fi - rem=`git config "branch.$r.remote" || echo origin` - bra=`git config "branch.$r.merge" || echo "$r"` + rem=`git config "branch.$r.remote" || $ECHO origin` + bra=`git config "branch.$r.merge" || $ECHO "$r"` upstream="$rem/${bra#refs/heads/}" if ! git rev-parse "$upstream" >/dev/null 2>&1; then upstream="origin/`repobranch "$d"`" fi logdata=`git log --color "$upstream".."$r"` if [ -n "$logdata" ]; then - if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then + if yesno "Push \"$r\" in $dv?" '$ECHO "$logdata" | less -r'; then verbose git push "$rem" HEAD fi fi @@ -480,44 +775,66 @@ case "$cmd" in done ;; compile) + cleand0=false + cleandp=false + cleanqcc=false + cleanqc=false + compiled0=false + debug=debug + snowleopardhack=false + if [ -z "$CC" ]; then + export CC="gcc -DSUPPORTIPV6" + fi + while :; do + case "$1" in + -0) + compiled0=true + shift + ;; + -c) + cleand0=true + cleandp=true + cleanqcc=true + cleanqc=true + shift + ;; + -r) + debug=release + export CC="$CC -g" + case "`$CC -dumpversion`" 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" + ;; + esac + if [ -n "$WE_HATE_OUR_USERS" ]; then + export CC="$CC -fno-common" + fi + 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" + snowleopardhack=true + 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 -fno-reorder-blocks -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 - ;; - -n) - cleandp=false - cleanqcc=false - cleanqc=false - shift - ;; - *) - cleandp=false - cleanqcc=false - cleanqc=true # version info - ;; - 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 @@ -532,7 +849,13 @@ case "$cmd" in sdl) TARGETS="$TARGETS sdl-debug" ;; - glx|agl|wgl) + agl) + TARGETS="$TARGETS cl-debug" + if $snowleopardhack; then + export CC="$CC -arch i386" + fi + ;; + glx|wgl) TARGETS="$TARGETS cl-debug" ;; dedicated) @@ -557,15 +880,63 @@ case "$cmd" in MAKEFLAGS=-j$ncpus fi fi - case "`uname`" in - Linux|*BSD) - MAKEFLAGS="$MAKEFLAGS DP_LINK_TO_LIBJPEG=1" - ;; - esac if [ -n "$WE_HATE_OUR_USERS" ]; then - MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw" + MAKEFLAGS="$MAKEFLAGS DP_MAKE_TARGET=mingw LIB_JPEG= CFLAGS_LIBJPEG=" + fi + fi + + enter "$d0/d0_blind_id" verbose + 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/libd0_rijndael"-* .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/libd0_rijndael".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux64/lib/ DP_CRYPTO_RIJNDAEL_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/libd0_rijndael".* .libs/ + #verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/ + MAKEFLAGS="$MAKEFLAGS DP_CRYPTO_STATIC_LIBDIR=../misc/builddeps/dp.linux32/lib/ DP_CRYPTO_RIJNDAEL_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/ + verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/ + ;; + *) + compiled0=true + ;; + esac fi fi + 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 enter "$d0/fteqcc" verbose if $cleanqcc; then @@ -575,22 +946,23 @@ 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 - echo "Warning: invalid empty client, default clients will be used." + $ECHO "Warning: invalid empty client, default clients will be used." fi if $cleandp; then 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." + $ECHO "Warning: discarded invalid client $T." done verbose "$SELF" update-maps @@ -598,12 +970,13 @@ case "$cmd" in 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 @@ -620,11 +993,11 @@ case "$cmd" in if [ -x "darkplaces/darkplaces$client.exe" ]; then client=$client.exe else - echo "Client darkplaces/darkplaces$client not found, aborting" + $ECHO "Client darkplaces/darkplaces$client not found, aborting" exit 1 fi fi - set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@" + set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@" # if pulseaudio is running: USE IT if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then @@ -635,10 +1008,30 @@ case "$cmd" in fi fi + binary=$1 + if [ -n "$USE_GDB" ]; then set -- gdb --args "$@" + elif which gdb >/dev/null 2>&1; then + set -- gdb --batch -x savecore.gdb --args "$@" + elif which catchsegv >/dev/null 2>&1; then + set -- catchsegv "$@" + fi + rm -f xonotic.core + "$@" || true + if [ -f xonotic.core ]; then + if yesno "The program has CRASHED. Do you want to examine the core dump?"; then + gdb "$binary" xonotic.core + #elif yesno "You did not want to examine the core dump. Do you want to provide it - including your DarkPlaces checkout - to the Xonotic developers?"; then + # tar cvzf xonotic.core.tar.gz xonotic.core darkplaces/*.c darkplaces/*.h + # # somehow send it + # rm -f xonotic.core.tar.gz + else + $ECHO "The core dump can be examined later by" + $ECHO " gdb $binary xonotic.core" + fi + exit 1 fi - "$@" ;; each|foreach) keep_going=false @@ -681,10 +1074,10 @@ case "$cmd" in continue fi if git format-patch -o "$patchdir/$i" "$UPSTREAM".."$BRANCH"; then - echo "$d" > "$patchdir/$i/info.txt" - echo "$BRANCH" >> "$patchdir/$i/info.txt" - echo "$UPSTREAM" >> "$patchdir/$i/info.txt" - echo "$TRACK" >> "$patchdir/$i/info.txt" + $ECHO "$d" > "$patchdir/$i/info.txt" + $ECHO "$BRANCH" >> "$patchdir/$i/info.txt" + $ECHO "$UPSTREAM" >> "$patchdir/$i/info.txt" + $ECHO "$TRACK" >> "$patchdir/$i/info.txt" i=$(($i+1)) else rm -rf "$patchdir/$i" @@ -725,12 +1118,12 @@ case "$cmd" in reportecho() { report=$report"$*$LF" - echo "$*" + $ECHO "$*" } reportecho4() { report=$report" $*$LF" - echo " $*" + $ECHO " $*" } reportdo4() { @@ -738,6 +1131,12 @@ case "$cmd" in reportecho "$o" } for d in $repos; do + case "$d" in + fteqcc) + # sorry, fteqcc repo is managed manually + continue + ;; + esac enter "$d0/$d" verbose base="`repobranch "$d"`" reportecho "In $d:" @@ -787,22 +1186,22 @@ case "$cmd" in diffdata=`git diff --color --find-copies-harder --ignore-space-change "$realbase"..."$ref"` if [ -z "$diffdata" ]; then reportecho4 "--> not merging, no changes vs master, branch contains redundant history" - if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then + if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ $ECHO "$logdata"; } | less -r'; then git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" fi elif [ -z "$branch" ] && [ -n "$note" ]; then - reportdo4 echo "$note" + reportdo4 $ECHO "$note" reportecho4 "--> not merging, already had this one rejected before" - elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then + elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ $ECHO "$logdata"; $ECHO "$diffdata"; } | less -r'; then git checkout "$realbase" org=`git rev-parse HEAD` - if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then + if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1 ' >/dev/null; }; then git reset --hard "$org" GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" reportecho4 "--> merge failed" - elif ! "$SELF" compile -n 2>&1 | tee "$t"; then + elif ! "$SELF" compile 2>&1 | tee "$t"; then git reset --hard "$org" GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref" reportdo4 cat "$t" @@ -815,13 +1214,18 @@ case "$cmd" in git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> test failed, branch deleted" elif [ -n "$note" ]; then - reportdo4 echo "$note" + reportdo4 $ECHO "$note" reportecho4 "--> test failed" else reportecho4 "--> test failed, postponed" fi else - echo "MERGING" + # apply crlf, or other cleanup filters (non-behavioural changes) + git reset --hard + find . -type f -exec touch {} \; + git commit -a --amend -C HEAD || true # don't fail if nothing to commit + + $ECHO "MERGING" case ",`repoflags "$d"`," in *,svn,*) # we do quite a mess here... luckily we know $org @@ -847,7 +1251,7 @@ case "$cmd" in git push origin :"${ref#refs/remotes/origin/}" reportecho4 "--> branch deleted" elif [ -n "$note" ]; then - reportdo4 echo "$note" + reportdo4 $ECHO "$note" reportecho4 "--> rejected" else reportecho4 "--> postponed" @@ -859,26 +1263,130 @@ case "$cmd" in reportecho "" done rm -f "$t" - echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt + $ECHO "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt ;; clean) + "$SELF" fix_config + "$SELF" update -N force=false - if [ x"$1" = x"-f" ]; then - force=true + gotoupstream=false + fetchupstream=false + gotomaster=false + rmuntracked=false + killbranches=false + # usage: + # ./all clean [-m] [-f | -fu | -fU] [-r] [-D] + # ./all clean --reclone + found=false + for X in "$@"; do + if [ x"$X" = x"--reclone" ]; then + force=true + fetchupstream=true + gotoupstream=true + gotomaster=true + rmuntracked=true + killbranches=true + elif [ x"$X" = x"-f" ]; then + force=true + elif [ x"$X" = x"-u" ]; then + gotoupstream=true + elif [ x"$X" = x"-U" ]; then + gotoupstream=true + fetchupstream=true + elif [ x"$X" = x"-fu" ]; then + force=true + gotoupstream=true + elif [ x"$X" = x"-fU" ]; then + force=true + gotoupstream=true + fetchupstream=true + elif [ x"$X" = x"-m" ]; then + gotomaster=true + elif [ x"$X" = x"-r" ]; then + rmuntracked=true + elif [ x"$X" = x"-D" ]; then + killbranches=true + elif $ECHO "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then + msg '' + msg " _____" + msg " ,--'-\\P/\`\\ FFFFFFF" + msg " __/_ B/,-.\\ FFFFFFF" + msg " / _\\ (// O\\\\ FFFFFF" + msg "| (O \`) _\\._ _)\\ FFFUU" + msg "| |___/.^d0~~\"\\ \\ UUUU" + msg "| |\`~' \\ | UUUU" + msg "| | __,C>|| UUUU" + msg "\\ /_ ,-/,-' | UUUU" + msg " \\\\_ \\_>~' / UUUU-" + msg '' + else + msg "Unknown arg: $X" + fi + found=true + shift + done + if ! $found; then + rmuntracked=true fi for d in $repos; do - enter "$d0/$d" verbose - if $force; then - verbose git checkout-index -fa + verbose cd "$d0/$d" + if $gotoupstream; then + if ! $force; then + msg "Must also use -f (delete local changes) when using -u" + exit 1 + fi + if $gotomaster; then + if $fetchupstream; then + verbose git fetch origin + verbose git remote prune origin + fi + verbose git checkout -f "`repobranch "$d"`" + verbose git reset --hard origin/"`repobranch "$d"`" + else + r=`git symbolic-ref HEAD` + r=${r#refs/heads/} + rem=`git config "branch.$r.remote" || $ECHO origin` + bra=`git config "branch.$r.merge" || $ECHO "$r"` + upstream="$rem/${bra#refs/heads/}" + if $fetchupstream; then + verbose git fetch "$rem" + verbose git remote prune "$rem" + fi + if ! git rev-parse "$upstream" >/dev/null 2>&1; then + upstream="origin/`repobranch "$d"`" + fi + verbose git reset --hard "$upstream" + fi + elif $gotomaster; then + if $force; then + verbose git checkout -f "`repobranch "$d"`" + verbose git reset --hard + else + verbose git checkout "`repobranch "$d"`" + fi + elif $force; then + verbose git reset --hard fi - case "$d" in - .) - verbose git clean -df - ;; - *) - verbose git clean -xdf - ;; - esac + if $rmuntracked; then + case "$d" in + .) + verbose git clean -df || true + ;; + *) + verbose git clean -xdf || true + ;; + esac + fi + if $killbranches; then + git for-each-ref --format='%(refname)' refs/heads/ | while IFS= read -r B; do + if [ x"$B" != x"`git symbolic-ref HEAD`" ]; then + verbose git branch -D "${B#refs/heads/}" + fi + done + git rev-parse refs/heads/master >/dev/null 2>&1 || verbose git branch --track master origin/master || true + git rev-parse "refs/heads/`repobranch "$d"`" >/dev/null 2>&1 || verbose git branch --track "`repobranch "$d"`" origin/"`repobranch "$d"`" || true + fi + checkself "$cmd" "$@" done ;; @@ -893,14 +1401,56 @@ 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 verbose rm -rf Xonotic Xonotic*.zip verbose mkdir -p Xonotic - verbose date +%Y%m%d > Xonotic/stamp.txt - verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | { + if [ -n "$RELEASEDATE" ]; then + verbose $ECHO "$RELEASEDATE" > Xonotic/stamp.txt + 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 key_0.d0pk | { verbose cd Xonotic verbose mkdir data fteqcc source source/darkplaces source/fteqcc verbose tar xvf - @@ -909,6 +1459,7 @@ case "$cmd" in 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 @@ -931,6 +1482,7 @@ case "$cmd" in verbose cd Xonotic/source verbose tar xvf - } + rm -f Xonotic/key_15.d0pk ;; release-compile-run) host=$1 @@ -938,27 +1490,53 @@ case "$cmd" in maketargets=$3 makeflags=$4 srcdir=$5 - targetfiles=$6 - case " $HOSTS_THAT_ARE_MYSELF " in - *\ $host\ *) - verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/" - verbose eval make -C "$buildpath" clean $maketargets $makeflags - for f in $targetfiles; do - verbose mv "$buildpath/${f%:*}" "${f##*:}" || true - done - ;; - *) - verbose rsync --delete -zvaSHP "$srcdir"/ "$host:$buildpath/" - verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags" - for f in $targetfiles; do - verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true - done - ;; - esac - # now rebrand the binaries... - for f in $targetfiles; do - verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true - done + depsdir=$6 + targetfiles=$7 + set -x + if [ -n "$targetfiles" ]; then + case " $HOSTS_THAT_ARE_DISABLED " in + *\ $host\ *) + exit + ;; + esac + case " $HOSTS_THAT_ARE_MYSELF " in + *\ $host\ *) + verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/" + verbose rsync --delete -zLvaSHP "$depsdir"/ "$buildpath.deps/" + verbose ln -snf "$buildpath.deps" "$buildpath/.deps" + verbose eval make -C "$buildpath" clean $maketargets $makeflags + for f in $targetfiles; do + verbose mv "$buildpath/${f%:*}" "${f##*:}" || true + done + ;; + *) + verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/" + verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/" + verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" + for f in $targetfiles; do + verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true + done + ;; + esac + # now rebrand the binaries... + for f in $targetfiles; do + #verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true + case "${f##*:}" in + xonotic*.exe) + verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}" + ( + d=`mktemp -d -t rebrand.XXXXXX` + cd "$d" + $ECHO "-mygames" > darkplaces.opt + zip -9r darkplaces.zip darkplaces.opt + cat darkplaces.zip + cd "$d0" + rm -rf "$d" + ) >> "${f##*:}" + ;; + esac + done + fi ;; release-compile) suffix=$1 @@ -967,47 +1545,65 @@ case "$cmd" in fteqcc_files=$4 darkplaces_maketargets=$5 darkplaces_files=$6 - verbose "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$fteqcc_files" - verbose "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$darkplaces_files" + host=xonotic-build-$suffix + verbose "$SELF" release-compile-run "$host" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$d0/misc/builddeps/dp.$suffix" "$fteqcc_files" + verbose "$SELF" release-compile-run "$host" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$d0/misc/builddeps/dp.$suffix" "$darkplaces_files" ;; release-engine-win32) verbose "$SELF" release-compile win32 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config"' \ + '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 \ + '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' \ + '' '' \ release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe' ;; release-engine-win64) verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -DSUPPORTDIRECTX -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-x64.exe' \ - 'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe' - # release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe' + 'sv-release sdl-release' 'darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe' + verbose "$SELF" release-compile win64 \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib -DSUPPORTIPV6" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ + '' '' \ + cl-release 'darkplaces.exe:Xonotic/xonotic-x64.exe' ;; release-engine-osx) # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed verbose "$SELF" release-compile osx \ - 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \ + 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \ - 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' 'darkplaces-dedicated:xonotic-osx-dedicated' + 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated' + verbose "$SELF" release-compile osx \ + 'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks -DSUPPORTIPV6"' \ + '' '' \ + 'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin' ;; release-engine-linux32) verbose "$SELF" release-compile linux32 \ - 'STRIP=: CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \ + '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' ;; release-engine-linux64) verbose "$SELF" release-compile linux64 \ - 'STRIP=: CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \ + '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' ;; release-engine) - verbose "$SELF" release-engine-win64 - verbose "$SELF" release-engine-osx - verbose "$SELF" release-engine-win32 - verbose "$SELF" release-engine-linux32 - verbose "$SELF" release-engine-linux64 + verbose "$SELF" release-engine-linux32 & + verbose "$SELF" release-engine-linux64 & + verbose "$SELF" release-engine-win32 & + verbose "$SELF" release-engine-win64 & + verbose "$SELF" release-engine-osx & + wait %1 + wait %2 + wait %3 + wait %4 + wait %5 + wait ;; release-maps) verbose "$SELF" update-maps @@ -1015,10 +1611,11 @@ 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 + # back out of: source/qcsrc/server ;; 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 @@ -1046,7 +1643,7 @@ case "$cmd" in # music: reduce bitrate verbose export do_jpeg=true verbose export jpeg_qual_rgb=80 - verbose export jpeg_qual_a=95 + verbose export jpeg_qual_a=97 verbose export do_dds=false verbose export do_ogg=true verbose export ogg_qual=1 @@ -1061,7 +1658,7 @@ case "$cmd" in verbose export do_jpeg=false verbose export do_jpeg_if_not_dds=true verbose export jpeg_qual_rgb=80 - verbose export jpeg_qual_a=95 + verbose export jpeg_qual_a=99 verbose export do_dds=true verbose export dds_flags= verbose export do_ogg=true @@ -1099,21 +1696,35 @@ case "$cmd" in major=$(($gv / 10000)) minor=$(($gv / 100 - $major * 100)) patch=$(($gv - $major * 10000 - $minor * 100)) + versionstr="$major.$minor.$patch" + case "$RELEASETYPE" in + beta) + versionstr="$versionstr""beta" + ;; + esac verbose sed -i " - s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /; + s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /; s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/; s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/; " defaultXonotic.cfg + ( + verbose cd gfx/menu/luminos + verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg . + verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr" + verbose rm background_l2.svg + ) fi if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do if [ -f "$X" ]; then verbose unzip "$X" + verbose rm -f maps/*.log maps/*.irc maps/*.lin fi done fi + verbose export git_src_repo="$d0/$src" # skip hash-object verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" - verbose zip -9yr "../../$dst" . + verbose mkzip "../../$dst" * verbose cd ../.. verbose rm -rf Xonotic/temp ;; @@ -1138,8 +1749,8 @@ case "$cmd" in ;; release-pack) verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' - verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds' - verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds' + verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' low '-low' lowdds '-lowdds' + verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' low '-low' lowdds '-lowdds' verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low '' ;; @@ -1155,39 +1766,55 @@ case "$cmd" in ;; release-zip) stamp=`cat Xonotic/stamp.txt` - verbose zip -9yr Xonotic-$stamp-common.zip \ + # 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 + # 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/source/*/ \ + Xonotic/bin64/*.dll \ + Xonotic/*.app \ + Xonotic/xonotic-* \ + Xonotic/xonotic.exe \ + Xonotic/source/darkplaces/ + verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip + verbose mkzip Xonotic-$stamp-common.zip \ + Xonotic/source/fteqcc/ \ + Xonotic/source/qcsrc/ \ Xonotic/Docs \ Xonotic/misc \ Xonotic/fteqcc \ Xonotic/server \ - Xonotic/*.app \ - Xonotic/xonotic-* \ - Xonotic/xonotic.exe \ + Xonotic/key_0.d0pk \ Xonotic/data/font-nimbussansl-$stamp.pk3 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip - verbose zip -0yr Xonotic-$stamp.zip \ + verbose mkzip0 Xonotic-$stamp.zip \ Xonotic/data/xonotic-$stamp-data.pk3 \ Xonotic/data/xonotic-$stamp-maps.pk3 \ Xonotic/data/xonotic-$stamp-music.pk3 \ Xonotic/data/xonotic-$stamp-nexcompat.pk3 verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-low.zip - verbose zip -0yr Xonotic-$stamp-low.zip \ + verbose mkzip0 Xonotic-$stamp-low.zip \ Xonotic/data/xonotic-$stamp-data-low.pk3 \ Xonotic/data/xonotic-$stamp-maps-low.pk3 \ Xonotic/data/xonotic-$stamp-music-low.pk3 - verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip - verbose zip -0yr Xonotic-$stamp-lowdds.zip \ +# verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip +# verbose mkzip0 Xonotic-$stamp-high.zip \ +# Xonotic/data/xonotic-$stamp-data-raw.pk3 \ +# Xonotic/data/xonotic-$stamp-maps-raw.pk3 \ +# Xonotic/data/xonotic-$stamp-music.pk3 \ +# Xonotic/data/xonotic-$stamp-nexcompat.pk3 + verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip + verbose mkzip0 Xonotic-$stamp-lowdds.zip \ Xonotic/data/xonotic-$stamp-data-lowdds.pk3 \ Xonotic/data/xonotic-$stamp-maps-lowdds.pk3 \ Xonotic/data/xonotic-$stamp-music-low.pk3 - verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip - verbose zip -0yr Xonotic-$stamp-high.zip \ - Xonotic/data/xonotic-$stamp-data-raw.pk3 \ - Xonotic/data/xonotic-$stamp-maps-raw.pk3 \ - Xonotic/data/xonotic-$stamp-music.pk3 \ - Xonotic/data/xonotic-$stamp-nexcompat.pk3 ;; release) verbose "$SELF" release-prepare @@ -1199,16 +1826,26 @@ case "$cmd" in ;; *) - echo "Usage:" - echo " $SELF pull" - echo " $SELF merge" - echo " $SELF push [-s]" - echo " $SELF branches" - echo " $SELF branch [] " - echo " $SELF branch " - echo " $SELF checkout [] " - echo " $SELF compile [-c|-n] [] " - echo " $SELF run [] " - echo " $SELF each " + $ECHO "Usage:" + $ECHO " $SELF admin-merge []" + $ECHO " $SELF branch " + $ECHO " $SELF branch []" + $ECHO " $SELF branches" + $ECHO " $SELF checkout|switch " + $ECHO " $SELF checkout|switch /" + $ECHO " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]" + $ECHO " $SELF clean --reclone" + $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" + $ECHO " $SELF restore-patches" + $ECHO " $SELF run [sdl|glx|wgl|agl|dedicated] options..." + $ECHO " $SELF save-patches" + $ECHO " $SELF update-maps" + $ECHO " $SELF update|pull [-N] [-s | -h [-p] | -g [-p]] [-l de|nl|default]" ;; esac