msg()
{
- echo "\e[1m$*\e[m"
+ echo >&2 "\e[1m$*\e[m"
}
self=`git hash-object "$SELF"`
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 |
"
# todo: in darkplaces, change repobranch to div0-stable
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
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
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 remote.origin.autocrlf input
-
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
if git config branch.$r.remote >/dev/null 2>&1; then
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
misc/tools/xonotic-map-compiler-autobuild download
;;
checkout|switch)
+ checkoutflags=
+ if [ x"$1" = x"-f" ]; then
+ checkoutflags=-f
+ shift
+ fi
remote=$1
branch=$2
if [ -z "$branch" ]; then
b=$branch
if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout "$b"
+ verbose git checkout $checkoutflags "$b"
elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout --track -b "$b" "$remote/$b"
+ verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
else
b=`repobranch "$d"`
if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout "$b"
+ verbose git checkout $checkoutflags "$b"
elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
exists=true
- verbose git checkout --track -b "$b" "$remote/$b"
+ verbose git checkout $checkoutflags --track -b "$b" "$remote/$b"
else
echo "WTF? Not even branch $b doesn't exist in $d"
exit 1
cleanqc=true
shift
;;
- -n)
- cleandp=false
- cleanqcc=false
- cleanqc=false
- shift
- ;;
*)
cleandp=false
cleanqcc=false
- cleanqc=true # version info
+ cleanqc=false
;;
esac
if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
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
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:$PATH"
elif [ x"`uname`" = x"Darwin" ]; then
export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
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
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"
rm -f "$t"
echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
;;
+ clean)
+ force=false
+ if [ x"$1" = x"-f" ]; then
+ force=true
+ fi
+ for d in $repos; do
+ verbose cd "$d0/$d"
+ if $force; then
+ verbose git reset --hard
+ #redundant# verbose git checkout-index -fa
+ fi
+ case "$d" in
+ .)
+ verbose git clean -df
+ ;;
+ *)
+ verbose git clean -xdf
+ ;;
+ esac
+ done
+ ;;
# release building goes here
release-prepare)
#"$SELF" each git clean -fxd
- rm -rf Xonotic Xonotic*.zip
- mkdir -p Xonotic
- date +%Y%m%d > Xonotic/stamp.txt
- git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
- cd Xonotic
- mkdir data fteqcc darkplaces-src fteqcc-src
- tar xvf -
- rm -rf misc/builddeps
- mv misc/buildfiles/win32/* . || true
- mv misc/buildfiles/win64/* . || true
- mv misc/buildfiles/osx/* . || true
- rm -rf misc/buildfiles
+ case "$RELEASETYPE" in
+ beta)
+ msg "Building a BETA"
+ ;;
+ release)
+ msg "Building a RELEASE"
+ ;;
+ *)
+ msg "Must either set RELEASETYPE=beta or RELEASETYPE=release"
+ exit 1
+ ;;
+ esac
+ verbose rm -rf Xonotic Xonotic*.zip
+ verbose mkdir -p Xonotic
+ 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 | {
+ verbose cd Xonotic
+ verbose mkdir data fteqcc source source/darkplaces source/fteqcc
+ verbose tar xvf -
+ verbose rm -rf misc/builddeps
+ verbose mv misc/buildfiles/win32/* . || true
+ verbose mv misc/buildfiles/win64 bin64 || true
+ verbose mv misc/buildfiles/osx/* . || true
+ verbose rm -rf misc/buildfiles
+ }
+ {
+ verbose cd darkplaces
+ verbose git archive --format=tar HEAD
+ } | {
+ verbose cd Xonotic/source/darkplaces
+ verbose tar xvf -
}
{
- cd darkplaces
- git archive --format=tar HEAD
+ verbose cd fteqcc
+ verbose git archive --format=tar HEAD
} | {
- cd Xonotic/darkplaces-src
- tar xvf -
+ verbose cd Xonotic/source/fteqcc
+ verbose tar xvf -
}
{
- cd fteqcc
- git archive --format=tar HEAD
+ verbose cd data/xonotic-data.pk3dir
+ verbose git archive --format=tar HEAD -- qcsrc Makefile
} | {
- cd Xonotic/fteqcc-src
- tar xvf -
+ verbose cd Xonotic/source
+ verbose tar xvf -
}
;;
release-compile-run)
maketargets=$3
makeflags=$4
srcdir=$5
- targetfiles=$6
- case " $HOSTS_THAT_ARE_MYSELF " in
- *\ $host\ *)
- rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
- (
- cd $buildpath
- verbose eval make clean $maketargets $makeflags
- )
- for f in $targetfiles; do
- verbose mv "$buildpath/${f%:*}" "${f##*:}"
- done
- ;;
- *)
- rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
- verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
- for f in $targetfiles; do
- verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
- done
- ;;
- esac
+ 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
fteqcc_files=$4
darkplaces_maketargets=$5
darkplaces_files=$6
- "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/fteqcc-src" "$fteqcc_files"
- "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$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)
- "$SELF" release-compile win32 \
- 'DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -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"' \
+ # 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' \
win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
- debug 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
+ release 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
;;
release-engine-win64)
- "$SELF" release-compile win64 \
- 'DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -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=""' \
- win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
- debug 'darkplaces.exe:Xonotic/xonotic-64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-64.exe'
+ # 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' \
+ 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'
;;
- release-engine-osx)
- "$SELF" release-compile osx \
- 'CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib"' \
+ 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.deps/include -L.deps/lib -fno-reorder-blocks"' \
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
- sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
+ '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)
- "$SELF" release-compile linux32 \
- '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' \
+ 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' \
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
- debug 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
+ release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
;;
release-engine-linux64)
- "$SELF" release-compile linux64 \
- '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' \
+ 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' \
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
- debug 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
+ release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
;;
release-engine)
- "$SELF" release-engine-win32 &
- "$SELF" release-engine-win64 &
- "$SELF" release-engine-osx &
- "$SELF" release-engine-linux32 &
- "$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)
- "$SELF" update-maps
+ verbose "$SELF" update-maps
;;
release-qc)
- verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
+ case "$RELEASETYPE" in
+ beta)
+ verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
+ ;;
+ release)
+ verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
+ ;;
+ esac
+ verbose rm -f Xonotic/source/*/fteqcc.log
;;
release-buildpk3-transform-raw)
dir=$1
;;
release-buildpk3-transform-normal)
dir=$1
- cd "$dir"
+ verbose cd "$dir"
# texture: convert to jpeg and dds
- export do_jpeg=true
- export jpeg_qual_rgb=95
- export jpeg_qual_a=99
- export do_dds=true
- export dds_flags=
- export do_ogg=false
- export del_src=true
- find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+ verbose export do_jpeg=true
+ verbose export jpeg_qual_rgb=95
+ verbose export jpeg_qual_a=99
+ verbose export do_dds=true
+ verbose export dds_flags=
+ verbose export do_ogg=false
+ verbose export del_src=true
+ find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-buildpk3-transform-low)
dir=$1
- cd "$dir"
+ verbose cd "$dir"
# texture: convert to jpeg and dds
# music: reduce bitrate
- export do_jpeg=true
- export jpeg_qual_rgb=80
- export jpeg_qual_a=95
- export do_dds=false
- export do_ogg=true
- export ogg_qual=1
- export del_src=true
- find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+ verbose export do_jpeg=true
+ verbose export jpeg_qual_rgb=80
+ verbose export jpeg_qual_a=95
+ verbose export do_dds=false
+ verbose export do_ogg=true
+ verbose export ogg_qual=1
+ verbose export del_src=true
+ find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-buildpk3-transform-lowdds)
dir=$1
- cd "$dir"
+ verbose cd "$dir"
# texture: convert to jpeg and dds
# music: reduce bitrate
- export do_jpeg=false
- export do_jpeg_if_not_dds=true
- export jpeg_qual_rgb=80
- export jpeg_qual_a=95
- export do_dds=true
- export dds_flags=
- export do_ogg=true
- export ogg_qual=1
- export del_src=true
- find . -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
- if [ -f "quake.rc" ]; then
- echo "r_texture_dds_load 1" >> quake.rc
- fi
+ 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 do_dds=true
+ verbose export dds_flags=
+ verbose export do_ogg=true
+ verbose export ogg_qual=1
+ verbose export del_src=true
+ find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-buildpk3)
src=$1
dst="$PWD/$dst"
;;
esac
- rm -rf Xonotic/temp
- mkdir -p Xonotic/temp
+ verbose rm -rf Xonotic/temp
+ verbose mkdir -p Xonotic/temp
{
- cd "$src"
- git archive --format=tar HEAD
+ verbose cd "$src"
+ verbose git archive --format=tar HEAD
} | {
- cd Xonotic/temp
- tar xvf -
+ verbose cd Xonotic/temp
+ verbose tar xvf -
}
+ verbose cd Xonotic/temp
if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
- cp "$src"/progs.dat Xonotic/temp/
- cp "$src"/csprogs.dat Xonotic/temp/
- cp "$src"/menu.dat Xonotic/temp/
- fi
- if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
- for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
- if [ -f "$X" ]; then
- (
- cd Xonotic/temp
- unzip ../../"$X"
- )
- fi
- done
- fi
- if [ -f "defaultXonotic.cfg" ]; then
+ verbose cp ../source/progs.dat .
+ verbose cp ../source/csprogs.dat .
+ verbose cp ../source/menu.dat .
+ verbose rm -rf qcsrc
gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
major=$(($gv / 10000))
minor=$(($gv / 100 - $major * 100))
patch=$(($gv - $major * 10000 - $minor * 100))
- sed -i "
- s/^set g_xonoticversion [^ ]* /set g_xonoticversion $major.$minor.$patch /;
+ versionstr="$major.$minor.$patch"
+ case "$RELEASETYPE" in
+ beta)
+ versionstr="$versionstr""beta"
+ ;;
+ esac
+ verbose sed -i "
+ 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
- echo "r_texture_dds_load 1" >> quake.rc
+ (
+ 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
- "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
- cd Xonotic/temp
- zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
- cd ../..
- rm -rf Xonotic/temp
+ 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 mkzip "../../$dst" *
+ verbose cd ../..
+ verbose rm -rf Xonotic/temp
;;
release-buildpk3s)
stamp=`cat Xonotic/stamp.txt`
;;
esac
while [ "$#" -gt 1 ]; do
- "$SELF" release-buildpk3 "$src" "Xonotic/$dst$2.pk3" "$1"
+ verbose "$SELF" release-buildpk3 "$src" "Xonotic/$dst$2.pk3" "$1"
shift
shift
done
;;
release-pack)
- "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
- "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds'
- "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low' lowdds '-lowdds'
- "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low'
- "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
+ 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-music.pk3dir raw '' low '-low'
+ verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
;;
release-pack-needsx11)
case "$DISPLAY" in
'')
- startx "$SELF" release-pack -- /usr/bin/Xvfb :7
+ verbose startx "$SELF" release-pack -- /usr/bin/Xvfb :7
;;
*)
- "$SELF" release-pack
+ verbose "$SELF" release-pack
;;
esac
;;
release-zip)
stamp=`cat Xonotic/stamp.txt`
- zip -9r Xonotic-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
+ # need to use infozip for these (+x bits)
+ verbose mkzip Xonotic-$stamp-engine.zip \
Xonotic/*.dll \
- Xonotic/darkplaces-src \
+ Xonotic/bin64/*.dll \
+ Xonotic/*.app \
+ Xonotic/xonotic-* \
+ Xonotic/xonotic.exe
+ verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+ verbose mkzip Xonotic-$stamp-common.zip \
+ Xonotic/source/*/ \
Xonotic/Docs \
- Xonotic/fteqcc-src \
Xonotic/misc \
Xonotic/fteqcc \
Xonotic/server \
- Xonotic/*.app \
- Xonotic/xonotic-* \
Xonotic/data/font-nimbussansl-$stamp.pk3
- cp Xonotic-common.zip Xonotic.zip
- zip -0r Xonotic.zip \
+ verbose cp Xonotic-$stamp-common.zip 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
- cp Xonotic-common.zip Xonotic-low.zip
- zip -0r Xonotic-low.zip \
+ verbose cp Xonotic-$stamp-common.zip 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 \
- Xonotic/data/xonotic-$stamp-nexcompat.pk3
- cp Xonotic-common.zip Xonotic-lowdds.zip
- zip -0r Xonotic-lowdds.zip \
+ Xonotic/data/xonotic-$stamp-music-low.pk3
+ verbose cp 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 \
- Xonotic/data/xonotic-$stamp-nexcompat.pk3
- cp Xonotic-common.zip Xonotic-high.zip
- zip -0r Xonotic-high.zip \
+ 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
- rm -f Xonotic-common.zip
;;
release)
- "$SELF" release-prepare
- "$SELF" release-maps &
- "$SELF" release-engine &
- wait
- "$SELF" release-qc
- "$SELF" release-pack-needsx11
- "$SELF" release-zip
+ verbose "$SELF" release-prepare
+ verbose "$SELF" release-maps
+ verbose "$SELF" release-engine
+ verbose "$SELF" release-qc
+ verbose "$SELF" release-pack-needsx11
+ verbose "$SELF" release-zip
;;
*)
projects / xonotic / xonotic.git / blobdiff