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
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
+ }
+
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 core.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
fi
case "$1" in
-c)
+ cleand0=true
cleandp=true
cleanqcc=true
cleanqc=true
shift
;;
-n)
+ cleand0=false
cleandp=false
cleanqcc=false
cleanqc=false
shift
;;
*)
+ cleand0=false
cleandp=false
cleanqcc=false
cleanqc=true # version info
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
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 | {
+ 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
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
+ if [ -n "$targetfiles" ]; then
+ 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" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+ done
+ fi
;;
release-compile)
suffix=$1
'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)
+ 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" LIB_JPEG= CFLAGS_LIBJPEG=' \
+ '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"' \
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$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
+ '' '' \
+ 'cl-release' 'darkplaces-glx: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 \
projects / xonotic / xonotic.git / commitdiff