darkplaces | | div0-stable | svn
netradiant | | master |
div0-gittools | | master | no
+d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master |
data/xonotic-maps.pk3dir | | master |
mediasource | | master | no
fteqcc | http://github.com/Blub/qclib.git | master |
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
+ ;;
update|pull)
allow_pull=true
if [ x"$1" = x"-N" ]; then
allow_pull=false
fi
+ if $allow_pull; then
+ "$SELF" fix_config
+ fi
for d in $repos; do
url=`repourl "$d"`
pushurl=`repopushurl "$d"`
if [ -d "$d0/$d" ]; then
if $allow_pull; then
enter "$d0/$d" verbose
- fix_git_config "$url" "$pushurl"
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
if git config branch.$r.remote >/dev/null 2>&1; then
done
;;
compile)
+ cleand0=false
+ cleandp=false
+ cleanqcc=false
+ cleanqc=false
+ debug=debug
+ while :; do
+ case "$1" in
+ -c)
+ cleand0=true
+ cleandp=true
+ cleanqcc=true
+ cleanqc=true
+ shift
+ ;;
+ -r)
+ debug=release
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ done
if [ -z "$CC" ]; then
export CC="gcc -DSUPPORTIPV6"
fi
if [ -n "$WE_HATE_OUR_USERS" ]; then
- TARGETS="sv-debug cl-debug"
+ 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"
+ TARGETS="sv-$debug sdl-$debug"
;;
esac
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
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
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
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
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
done
;;
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 -
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
verbose cd Xonotic/source
verbose tar xvf -
}
+ rm -f Xonotic/key_15.d0pk
;;
release-compile-run)
host=$1
;;
release-engine-win32)
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' \
+ 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -march=i686 -mtune=generic -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 \
;;
release-engine-linux32)
verbose "$SELF" release-compile linux32 \
- 'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
+ 'STRIP=: CC="gcc -m32 -march=i686 -mtune=generic -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 -DSUPPORTIPV6" 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'
;;
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/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 \
projects / xonotic / xonotic.git / blobdiff