X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=9002abffe2e3395fc1b94cb01a251442adbdf72f;hp=e4eb461fb810ff5a43a5152c44e27b014935a29f;hb=44e1d2ae38bd0f5fd07b44fdc7ac5427834b7a43;hpb=da36e2366a9336cec50b66bf11aa928d1f4ee226 diff --git a/all b/all index e4eb461f..9002abff 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"` @@ -109,16 +110,17 @@ enter() } repos_urls=" -. | | master | -data/xonotic-data.pk3dir | | master | -data/xonotic-maps.pk3dir | | master | -data/xonotic-music.pk3dir | | master | -data/xonotic-nexcompat.pk3dir | | master | no -mediasource | | master | no -darkplaces | | div0-stable | svn -fteqcc | git://github.com/Blub/qclib.git | master | -div0-gittools | | master | no -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 @@ -134,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() { @@ -156,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 ' '` @@ -266,10 +301,26 @@ fix_upstream_rebase_mergefail() fix_git_config() { - verbose git config core.autocrlf input - if [ -z "`git config push.default`" ]; then + 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() @@ -295,20 +346,154 @@ 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) ;; + default) ;; + *) + msg "Invalid location!" + msg "Possible locations for the -l option:" + msg " nl (Netherlands, run by merlijn)" + msg " de (Germany, run by divVerent)" + msg " default (currently nl)" + exit 1 + ;; + esac + fix_config=true + location=$2 + shift + else + break + fi + shift + done + 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 - 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 @@ -331,7 +516,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 @@ -520,38 +705,56 @@ 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 -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" + 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 -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 @@ -566,7 +769,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) @@ -596,6 +805,55 @@ case "$cmd" in 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/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 $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 verbose make $MAKEFLAGS clean @@ -604,9 +862,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 @@ -616,7 +875,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." @@ -627,12 +886,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 @@ -653,9 +913,7 @@ case "$cmd" in exit 1 fi fi - set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@" - # change this to: - #set -- "darkplaces/darkplaces$client" -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 @@ -666,10 +924,29 @@ 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 fi - "$@" ;; each|foreach) keep_going=false @@ -769,6 +1046,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:" @@ -833,7 +1116,7 @@ case "$cmd" in 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" @@ -852,6 +1135,11 @@ case "$cmd" in reportecho4 "--> test failed, postponed" fi else + # 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,*) @@ -893,32 +1181,55 @@ 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 gotomaster=false rmuntracked=false killbranches=false # usage: - # ./all clean [-m] [-f | -fu] [-r] [-D] - while :; do - if [ x"$1" = x"-f" ]; then + # ./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 - elif [ x"$1" = x"-u" ]; then + fetchupstream=true gotoupstream=true - elif [ x"$1" = x"-fu" ]; then + 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 - elif [ x"$1" = x"-m" ]; then + 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"$1" = x"-r" ]; then + elif [ x"$X" = x"-r" ]; then rmuntracked=true - elif [ x"$1" = x"-D" ]; then + elif [ x"$X" = x"-D" ]; then killbranches=true else break fi + found=true shift done + if ! $found; then + rmuntracked=true + fi for d in $repos; do verbose cd "$d0/$d" if $gotoupstream; then @@ -927,6 +1238,10 @@ case "$cmd" in 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 @@ -935,6 +1250,10 @@ case "$cmd" in 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 @@ -943,6 +1262,7 @@ case "$cmd" in elif $gotomaster; then if $force; then verbose git checkout -f "`repobranch "$d"`" + verbose git reset --hard else verbose git checkout "`repobranch "$d"`" fi @@ -965,7 +1285,10 @@ 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 + checkself "$cmd" "$@" done ;; @@ -980,7 +1303,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 @@ -991,7 +1352,7 @@ case "$cmd" in 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 - @@ -1000,6 +1361,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 @@ -1022,6 +1384,7 @@ case "$cmd" in verbose cd Xonotic/source verbose tar xvf - } + rm -f Xonotic/key_15.d0pk ;; release-compile-run) host=$1 @@ -1060,9 +1423,9 @@ case "$cmd" in # 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 + case "${f##*:}" in xonotic*.exe) - verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f" + 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" @@ -1071,7 +1434,7 @@ case "$cmd" in cat darkplaces.zip cd "$d0" rm -rf "$d" - ) >> "$f" + ) >> "${f##*:}" ;; esac done @@ -1089,46 +1452,45 @@ case "$cmd" in 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) - # TODO change to g++ and D3D=1 when D3D gets added 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" 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 \ + '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) - # TODO change to g++ and D3D=1 when D3D gets added verbose "$SELF" release-compile win64 \ - 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=0' \ + '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' \ - release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.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-sv-sdl) + 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.deps/include -L.deps/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/xonotic-osx-dedicated' - ;; - release-engine-osx-agl) - # 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 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I.deps/include -L.deps/lib -fno-reorder-blocks"' \ + '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-osx) - verbose "$SELF" release-engine-osx-sv-sdl - verbose "$SELF" release-engine-osx-agl - ;; release-engine-linux32) verbose "$SELF" release-compile linux32 \ - 'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" 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 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" 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' ;; @@ -1151,10 +1513,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 @@ -1182,7 +1545,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=99 verbose export do_dds=false verbose export do_ogg=true verbose export ogg_qual=1 @@ -1197,7 +1560,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 @@ -1288,8 +1651,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 '' ;; @@ -1307,20 +1670,30 @@ case "$cmd" in 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 \ Xonotic/*.app \ Xonotic/xonotic-* \ - Xonotic/xonotic.exe + Xonotic/xonotic.exe \ + Xonotic/source/darkplaces/ verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip verbose mkzip Xonotic-$stamp-common.zip \ - Xonotic/source/*/ \ + Xonotic/source/fteqcc/ \ + Xonotic/source/qcsrc/ \ Xonotic/Docs \ 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 \ @@ -1333,17 +1706,17 @@ case "$cmd" in 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 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 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 ;; release) verbose "$SELF" release-prepare @@ -1356,15 +1729,25 @@ case "$cmd" in *) echo "Usage:" - echo " $SELF pull" - echo " $SELF merge" - echo " $SELF push [-s]" + echo " $SELF admin-merge []" + echo " $SELF branch " + echo " $SELF branch []" echo " $SELF branches" - echo " $SELF branch [] " - echo " $SELF branch " - echo " $SELF checkout [] " - echo " $SELF compile [-c|-n] [] " - echo " $SELF run [] " - echo " $SELF each " + 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