X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=ffb7769702a3454682d670fc3b0e82ebd9542230;hp=57fb07b66457d5fef38cf549da0aa0a96c5bf96b;hb=6826e88c31c82664e3dc934e7d1888dea68f4d80;hpb=344cbae797415c32136298dfadf65c011c66ba1e diff --git a/all b/all index 57fb07b6..ffb77697 100755 --- a/all +++ b/all @@ -113,12 +113,13 @@ repos_urls=" data/xonotic-data.pk3dir | | master | data/xonotic-maps.pk3dir | | master | data/xonotic-music.pk3dir | | master | -data/xonotic-nexcompat.pk3dir | | master | -mediasource | | 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 | +div0-gittools | | master | no netradiant | | master | +d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master | " # todo: in darkplaces, change repobranch to div0-stable @@ -171,12 +172,47 @@ repoflags() 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 +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" - fi -done` + done +} + +repos=`listrepos` if [ "$#" = 0 ]; then set -- help @@ -229,6 +265,30 @@ fix_upstream_rebase_mergefail() fix_upstream_rebase } +fix_git_config() +{ + verbose git config core.autocrlf input + if [ -z "`git config push.default`" ]; then + verbose git config push.default current # or is tracking better? + fi +} + +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 "$@" +} + case "$cmd" in fix_upstream_rebase) for d in $repos; do @@ -247,11 +307,9 @@ case "$cmd" in 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/*" - - 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 @@ -274,6 +332,7 @@ case "$cmd" in else verbose git clone "$url" "$d0/$d" enter "$d0/$d" verbose + fix_git_config if [ "$branch" != "master" ]; then verbose git checkout --track -b "$branch" origin/"$branch" fi @@ -380,26 +439,15 @@ 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 @@ -407,14 +455,7 @@ case "$cmd" in 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 @@ -501,21 +542,17 @@ case "$cmd" in fi case "$1" in -c) + cleand0=true cleandp=true cleanqcc=true cleanqc=true shift ;; - -n) - cleandp=false - cleanqcc=false - cleanqc=false - shift - ;; *) + cleand0=false cleandp=false cleanqcc=false - cleanqc=true # version info + cleanqc=false ;; esac if [ $# -gt 0 ] && [ x"$1" = x"" ]; then @@ -557,16 +594,21 @@ 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 ! [ -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 @@ -598,12 +640,13 @@ case "$cmd" in run) if [ -n "$WE_HATE_OUR_USERS" ]; then client= - export PATH="$d0/misc/buildfiles/win64:$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 @@ -625,6 +668,8 @@ case "$cmd" in 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 "$@" # if pulseaudio is running: USE IT if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then @@ -797,7 +842,7 @@ case "$cmd" in 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" @@ -863,22 +908,106 @@ case "$cmd" in ;; clean) 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 + while :; do + if [ x"$1" = x"--reclone" ]; then + force=true + fetchupstream=true + gotoupstream=true + gotomaster=true + rmuntracked=true + killbranches=true + elif [ x"$1" = x"-f" ]; then + force=true + elif [ x"$1" = x"-u" ]; then + gotoupstream=true + elif [ x"$1" = x"-U" ]; then + gotoupstream=true + fetchupstream=true + elif [ x"$1" = x"-fu" ]; then + force=true + gotoupstream=true + elif [ x"$1" = x"-fU" ]; then + force=true + gotoupstream=true + fetchupstream=true + elif [ x"$1" = x"-m" ]; then + gotomaster=true + elif [ x"$1" = x"-r" ]; then + rmuntracked=true + elif [ x"$1" = x"-D" ]; then + killbranches=true + else + break + 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 + 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" + 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 + if $rmuntracked; then + case "$d" in + .) + verbose git clean -df + ;; + *) + verbose git clean -xdf + ;; + 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 fi - case "$d" in - .) - verbose git clean -df - ;; - *) - verbose git clean -xdf - ;; - esac done ;; @@ -899,8 +1028,12 @@ case "$cmd" in 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 +1042,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 +1065,7 @@ case "$cmd" in verbose cd Xonotic/source verbose tar xvf - } + rm -f Xonotic/key_15.d0pk ;; release-compile-run) host=$1 @@ -938,27 +1073,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,46 +1128,72 @@ 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 -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=1' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \ + '' '' + verbose "$SELF" release-compile win32 \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-g++ -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=1' \ + '' '' \ 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 -DUSE_WSPIAPI_H -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="x86_64-w64-mingw32-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \ win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-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' + '' '' + verbose "$SELF" release-compile win64 \ + 'STRIP=: DP_MAKE_TARGET=mingw CC="x86_64-w64-mingw32-g++ -g -Wl,--dynamicbase -Wl,--nxcompat -I.deps/include -L.deps/lib" WINDRES="x86_64-w64-mingw32-windres" SDL_CONFIG=".deps/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN64RELEASE=1 D3D=1' \ + '' '' \ + release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-x64-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-x64-dedicated.exe' ;; - release-engine-osx) + release-engine-osx-sv-sdl) # 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"' \ 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' + ;; + 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"' \ + '' '' \ + '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 -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 -g -I.deps/include -L.deps/lib" 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" 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-osx - verbose "$SELF" release-engine-win32 - # verbose "$SELF" release-engine-win64 - 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 @@ -1098,21 +1285,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 ;; @@ -1154,35 +1355,51 @@ 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 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 \ + 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 \ @@ -1199,15 +1416,24 @@ 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]" + echo " $SELF each|foreach [-k] command..." + echo " $SELF fix_upstream_rebase" + 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]" ;; esac