continue
;;
esac
+ # default: enable
+ msg "Repository $d enabled by default"
+ echo "$d"
done
}
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
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
force=true
fi
for d in $repos; do
- enter "$d0/$d" verbose
+ verbose cd "$d0/$d"
if $force; then
- verbose git checkout-index -fa
+ verbose git reset --hard
+ #redundant# verbose git checkout-index -fa
fi
case "$d" in
.)
esac
verbose rm -rf Xonotic Xonotic*.zip
verbose mkdir -p Xonotic
- verbose date +%Y%m%d > Xonotic/stamp.txt
+ 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
maketargets=$3
makeflags=$4
srcdir=$5
- targetfiles=$6
+ 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 -zvaSHP "$srcdir"/ "$buildpath/"
+ 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 -zvaSHP "$srcdir"/ "$host:$buildpath/"
- verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+ 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 && 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
+ #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
;;
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)
+ # 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$HOME/dp.win32/include -L$HOME/dp.win32/lib" WINDRES="i586-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win32/bin/sdl-config" LIB_JPEG= CFLAGS_LIBJPEG= WIN32RELEASE=1 D3D=0' \
+ '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' \
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$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/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" 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'
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/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$HOME/dp.osx/include -L$HOME/dp.osx/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"' \
'' '' \
- 'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+ 'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
;;
release-engine-osx)
verbose "$SELF" release-engine-osx-sv-sdl
;;
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 LIB_JPEG=$HOME/dp.linux32/lib/libjpeg.a' \
+ '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' \
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 LIB_JPEG=$HOME/dp.linux64/lib/libjpeg.a' \
+ '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' \
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
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 cd ../..
;;
release-zip)
stamp=`cat Xonotic/stamp.txt`
- verbose zip -9yr Xonotic-$stamp-common.zip \
+ verbose zip -9yr Xonotic-$stamp-engine.zip \
Xonotic/*.dll \
+ Xonotic/bin64/*.dll \
+ Xonotic/*.app \
+ Xonotic/xonotic-* \
+ Xonotic/xonotic.exe
+ verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+ verbose zip -9yr Xonotic-$stamp-common.zip \
Xonotic/source/*/ \
Xonotic/Docs \
Xonotic/misc \
Xonotic/fteqcc \
Xonotic/server \
- Xonotic/*.app \
- Xonotic/xonotic-* \
- Xonotic/xonotic.exe \
Xonotic/data/font-nimbussansl-$stamp.pk3
verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
verbose zip -0yr Xonotic-$stamp.zip \