debug=debug
snowleopardhack=false
if [ -z "$CC" ]; then
- export CC="gcc -DSUPPORTIPV6"
+ export CC="gcc"
fi
+ export CC="$CC -DSUPPORTIPV6"
while :; do
case "$1" in
-0)
#!/bin/sh
+# if we ever want to remove this script, install_name_tool can be used to replace the DYLD_LIBRARY_PATH hack
export DYLD_LIBRARY_PATH="${0%/*}"
# same dir as the executable
--- /dev/null
+#!/bin/sh
+
+logfile=$1
+shift
+
+if ! lockfile-create "$logfile.lock" >/dev/null 2>&1; then
+ exit 1
+fi
+lockfile-touch "$logfile.lock" & lockpid=$!
+
+if "$@" >"$logfile" 2>&1; then
+ : # all is well
+else
+ cat "$logfile"
+fi
+
+kill $lockpid
+lockfile-remove "$logfile.lock"
--- /dev/null
+#!/bin/sh
+
+set -e
+
+#exec >/dev/null 2>&1
+
+mkdir -p /var/cache/git/xonotic
+cd /var/cache/git/xonotic
+ssh xonotic@git.xonotic.org ./send-git-configs.sh | tar xvf -
+
+for X in /var/cache/git/*/*.git; do
+ cd "$X"
+ git config remote.origin.fetch "+refs/*:refs/*"
+ git config remote.origin.mirror "true"
+ git config remote.origin.url "git://nl.git.xonotic.org/${X#/var/cache/git/}"
+ git fetch
+ git remote prune origin
+ git gc --auto
+ touch git-daemon-export-ok
+done
--- /dev/null
+<VirtualHost *:80>
+ ServerName de.git.xonotic.org
+ ServerAlias nl.git.xonotic.org
+ ServerAlias us.git.xonotic.org
+ ServerAlias git.xonotic.org
+ ServerAdmin divVerent@xonotic.org
+
+ SetEnv GIT_PROJECT_ROOT /var/cache/git
+
+ AliasMatch ^/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /var/cache/git/$1
+ AliasMatch ^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/cache/git/$1
+ ScriptAliasMatch \
+ "(?x)^/(.*/(HEAD | \
+ info/refs | \
+ objects/info/[^/]+ | \
+ git-(upload|receive)-pack))$" \
+ /usr/lib/git-core/git-http-backend/$1
+
+ DocumentRoot /usr/share/gitweb
+ Alias /gitweb /usr/share/gitweb/static
+ DirectoryIndex gitweb.cgi
+
+ <Directory /usr/lib/git-core>
+ <Files git-http-backend>
+ Allow from all
+ Deny from none
+ Order Allow,Deny
+
+ Options +ExecCGI
+ SetHandler cgi-script
+ </Files>
+ </Directory>
+
+ <Directory /var/cache/git>
+ Allow from all
+ Deny from none
+ Order Allow,Deny
+
+ Options Indexes
+ </Directory>
+
+ <Directory /usr/share/gitweb>
+ Allow from all
+ Deny from none
+ Order Allow,Deny
+
+ Options Indexes
+ <Files gitweb.cgi>
+ Options +ExecCGI
+ SetHandler cgi-script
+ </Files>
+ </Directory>
+</VirtualHost>
--- /dev/null
+#!/bin/sh
+
+ssh rpolzer@rm.endoftheinternet.org
mepwd=$PWD
me=$0
-if ! lockfile-create "$me"; then
- exit 1
-fi
-lockfile-touch "$me" & lockpid=$!
-trap 'kill $lockpid || true; cd "$mepwd"; lockfile-remove "$me"' EXIT
-trap 'exit 1' INT TERM
+export PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/bin/vendor_perl:/usr/bin/core_perl
set -e
cd xonotic
./all clean -m -fU -D
# like reclone but do not delete untracked, so q3map2.x86 compile stays
-./all compile
-export __GL_FSAA_MODE=8
+./all compile -r
+export DRIVER=soft
+#export DRIVERFLAGS="+gl_texturecompression 1 -nofbo"
+#export DRIVERFLAGS="+gl_texturecompression 1"
+
+#startx /bin/sh -x ./misc/tools/xonotic-map-compiler-autobuild screenshot -- /usr/bin/Xvfb :7 -screen 0 1024x768x24
sh -x ./misc/tools/xonotic-map-compiler-autobuild screenshot
-GET http://beta.xonotic.org/autobuild-bsp/ >/dev/null
-cd "$HOME/autobuild-bsp" || exit 1
-now=`date +%s`
-deltime=$(($now + 86400))
-grep -l -- '-->(none)<!--' */index.html | cut -d / -f 1 | while IFS= read -r D; do
- for F in "$D" "$D.pk3" "`echo "$D" | rev | cut -d - -f 3- | rev`-full-`echo "$D" | rev | cut -d - -f 1-2 | rev`.pk3"; do
- echo "$deltime $F" >> .to_delete
- done
-done
-while IFS=' ' read -r d f; do
- if [ $d -lt $now ]; then
- rm -rf "$f"
- else
- echo "$d $f"
- fi
-done < .to_delete > .to_delete_new
-mv .to_delete_new .to_delete
+lwp-request -m GET http://beta.xonotic.org/autobuild-bsp/?d,c >/dev/null
--- /dev/null
+@echo off\r
+\r
+if "%1" == "did-copy" goto copied\r
+cd %~dp0\r
+rmdir /s /q %TEMP%\xonotic-rsync-updater\r
+mkdir %TEMP%\xonotic-rsync-updater\r
+for %%f in (*.exe *.dll *.bat) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
+%TEMP%\xonotic-rsync-updater\%~n0 did-copy\r
+exit\r
+\r
+:copied\r
+\r
+set buildtype=release\r
+if "%~n0" == "update-to-autobuild" set buildtype=autobuild\r
+\r
+set options=-Prtzil --executability --delete-after --delete-excluded --stats\r
+\r
+if exist Xonotic-low goto xonoticlow\r
+if exist Xonotic-high goto xonotichigh\r
+if exist ..\..\..\.git goto xonoticdatagit\r
+if exist ..\..\..\data goto xonoticdata\r
+goto xonotic\r
+:xonoticlow\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ set target=Xonotic-low/\r
+ goto endxonotic\r
+:xonotichigh\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ set target=Xonotic-high/\r
+ goto endxonotic\r
+:xonoticdatagit\r
+ echo NOTE: this is a git repository download. Using the regular update method.\r
+ ..\..\..\all update\r
+ goto end\r
+:xonoticdata\r
+ if exist ..\..\..\misc\tools\rsync-updater\rsync.exe goto xonoticdatarsync\r
+ echo FATAL: rsync not in misc\tools\rsync-updater. This update script cannot be used.\r
+ goto end\r
+:xonoticdatarsync\r
+ set PATH=misc\tools\rsync-updater;%PATH%\r
+ cd ..\..\..\r
+ if exist data\xonotic-rsync-data-low.pk3 goto xonoticdatalow\r
+ if exist data\xonotic-*-data-low.pk3 goto xonoticdatalowfuzzy\r
+ if exist data\xonotic-rsync-data-high.pk3 goto xonoticdatahigh\r
+ if exist data\xonotic-*-data-high.pk3 goto xonoticdatahighfuzzy\r
+ if exist data\xonotic-rsync-data.pk3 goto xonoticdatanormal\r
+ if exist data\xonotic-*-data.pk3 goto xonoticdatanormalfuzzy\r
+ echo FATAL: unrecognized Xonotic build. This update script cannot be used.\r
+ goto end\r
+:xonoticdatalow\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ goto endxonoticdata\r
+:xonoticdatalowfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:xonoticdatahigh\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ goto endxonoticdata\r
+:xonoticdatahighfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:xonoticdatanormal\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ goto endxonoticdata\r
+:xonoticdatanormalfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:endxonoticdata\r
+ set target=./\r
+ goto endxonotic\r
+:xonotic\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ set target=Xonotic/\r
+ goto endxonotic\r
+:endxonotic\r
+\r
+set excludes=\r
+if not "%XONOTIC_INCLUDE_ALL%" == "" goto endbit\r
+set excludes=%excludes% --exclude=/xonotic-linux*\r
+set excludes=%excludes% --exclude=/xonotic-osx-*\r
+set excludes=%excludes% --exclude=/Xonotic*.app\r
+set excludes=%excludes% --exclude=/fteqcc/fteqcc.linux*\r
+set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx\r
+\r
+if "%ProgramFiles(x86)%" == "" goto bit32\r
+:bit64\r
+ if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
+ set excludes=%excludes% --exclude=/xonotic.exe\r
+ set excludes=%excludes% --exclude=/xonotic-sdl.exe\r
+ set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r
+ set excludes=%excludes% --exclude=/fteqcc/fteqcc.exe\r
+ set excludes=%excludes% --exclude=/bin32\r
+ set excludes=%excludes% --exclude=/*.dll\r
+ goto endbit\r
+:bit32\r
+ set excludes=%excludes% --exclude=/xonotic-x64.exe\r
+ set excludes=%excludes% --exclude=/xonotic-x64-sdl.exe\r
+ set excludes=%excludes% --exclude=/xonotic-x64-dedicated.exe\r
+ set excludes=%excludes% --exclude=/fteqcc/fteqcc-x64.exe\r
+ set excludes=%excludes% --exclude=/bin64\r
+ goto endbit\r
+:endbit\r
+\r
+for %%f in (*.exe *.dll) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
+%TEMP%\xonotic-rsync-updater\rsync %options% %excludes% %url% %target%\r
+%TEMP%\xonotic-rsync-updater\chmod -R a+x %target%\r
+\r
+:end\r
+pause\r
+rmdir /s /q %TEMP%\xonotic-rsync-updater\r
--- /dev/null
+#!/bin/sh
+
+if [ -d "${0%/*}" ]; then
+ cd "${0%/*}"
+fi
+
+if ! which rsync >/dev/null; then
+ echo >&2 "FATAL: rsync not found, please install the rsync package"
+ exit 1
+fi
+
+case "${0##*/}" in
+ update-to-autobuild.sh)
+ buildtype=autobuild
+ ;;
+ *)
+ buildtype=release
+ ;;
+esac
+
+options="-Prtzil --executability --delete-after --delete-excluded --stats"
+
+if [ -d "Xonotic-low" ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ target="Xonotic-low/"
+elif [ -d "Xonotic-high" ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ target="Xonotic-high/"
+elif [ -d "../../../.git" ]; then
+ echo >&2 "NOTE: this is a git repository download. Using the regular update method."
+ exec ../../../all update
+elif [ -d "../../../data" ]; then
+ if [ -f ../../../data/xonotic-rsync-data-low.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ elif [ -f ../../../data/xonotic-*-data-low.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ options="$options -y" # use fuzzy matching because file names differ
+ elif [ -f ../../../data/xonotic-rsync-data-high.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ elif [ -f ../../../data/xonotic-*-data-high.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ options="$options -y" # use fuzzy matching because file names differ
+ elif [ -f ../../../data/xonotic-rsync-data.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ elif [ -f ../../../data/xonotic-*-data.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ options="$options -y" # use fuzzy matching because file names differ
+ else
+ echo >&2 "FATAL: unrecognized Xonotic build. This update script cannot be used."
+ exit 1
+ fi
+ target="../../.."
+else
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ target="Xonotic/"
+fi
+
+excludes=
+if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
+ excludes="$excludes --exclude=/*.exe"
+ excludes="$excludes --exclude=/fteqcc/*.exe"
+ excludes="$excludes --exclude=/bin32"
+ excludes="$excludes --exclude=/*.dll"
+ excludes="$excludes --exclude=/bin64"
+
+ case `uname`:`uname -m` in
+ Darwin:*)
+ excludes="$excludes --exclude=/xonotic-linux*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux*"
+ ;;
+ Linux:x86_64)
+ excludes="$excludes --exclude=/Xonotic*.app"
+ excludes="$excludes --exclude=/xonotic-osx-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+ if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
+ excludes="$excludes --exclude=/xonotic-linux32-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+ fi
+ ;;
+ Linux:i?86)
+ excludes="$excludes --exclude=/Xonotic*.app"
+ excludes="$excludes --exclude=/xonotic-osx-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+ excludes="$excludes --exclude=/xonotic-linux64-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux64"
+ ;;
+ *)
+ echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
+ ;;
+ esac
+fi
+
+rsync $options $excludes "$url" "$target"
--- /dev/null
+@echo off\r
+\r
+if "%1" == "did-copy" goto copied\r
+cd %~dp0\r
+rmdir /s /q %TEMP%\xonotic-rsync-updater\r
+mkdir %TEMP%\xonotic-rsync-updater\r
+for %%f in (*.exe *.dll *.bat) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
+%TEMP%\xonotic-rsync-updater\%~n0 did-copy\r
+exit\r
+\r
+:copied\r
+\r
+set buildtype=release\r
+if "%~n0" == "update-to-autobuild" set buildtype=autobuild\r
+\r
+set options=-Prtzil --executability --delete-after --delete-excluded --stats\r
+\r
+if exist Xonotic-low goto xonoticlow\r
+if exist Xonotic-high goto xonotichigh\r
+if exist ..\..\..\.git goto xonoticdatagit\r
+if exist ..\..\..\data goto xonoticdata\r
+goto xonotic\r
+:xonoticlow\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ set target=Xonotic-low/\r
+ goto endxonotic\r
+:xonotichigh\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ set target=Xonotic-high/\r
+ goto endxonotic\r
+:xonoticdatagit\r
+ echo NOTE: this is a git repository download. Using the regular update method.\r
+ ..\..\..\all update\r
+ goto end\r
+:xonoticdata\r
+ if exist ..\..\..\misc\tools\rsync-updater\rsync.exe goto xonoticdatarsync\r
+ echo FATAL: rsync not in misc\tools\rsync-updater. This update script cannot be used.\r
+ goto end\r
+:xonoticdatarsync\r
+ set PATH=misc\tools\rsync-updater;%PATH%\r
+ cd ..\..\..\r
+ if exist data\xonotic-rsync-data-low.pk3 goto xonoticdatalow\r
+ if exist data\xonotic-*-data-low.pk3 goto xonoticdatalowfuzzy\r
+ if exist data\xonotic-rsync-data-high.pk3 goto xonoticdatahigh\r
+ if exist data\xonotic-*-data-high.pk3 goto xonoticdatahighfuzzy\r
+ if exist data\xonotic-rsync-data.pk3 goto xonoticdatanormal\r
+ if exist data\xonotic-*-data.pk3 goto xonoticdatanormalfuzzy\r
+ echo FATAL: unrecognized Xonotic build. This update script cannot be used.\r
+ goto end\r
+:xonoticdatalow\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ goto endxonoticdata\r
+:xonoticdatalowfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-low/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:xonoticdatahigh\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ goto endxonoticdata\r
+:xonoticdatahighfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic-high/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:xonoticdatanormal\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ goto endxonoticdata\r
+:xonoticdatanormalfuzzy\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ set options=%options% -y\r
+ goto endxonoticdata\r
+:endxonoticdata\r
+ set target=./\r
+ goto endxonotic\r
+:xonotic\r
+ set url=rsync://beta.xonotic.org/%buildtype%-Xonotic/\r
+ set target=Xonotic/\r
+ goto endxonotic\r
+:endxonotic\r
+\r
+set excludes=\r
+if not "%XONOTIC_INCLUDE_ALL%" == "" goto endbit\r
+set excludes=%excludes% --exclude=/xonotic-linux*\r
+set excludes=%excludes% --exclude=/xonotic-osx-*\r
+set excludes=%excludes% --exclude=/Xonotic*.app\r
+set excludes=%excludes% --exclude=/fteqcc/fteqcc.linux*\r
+set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx\r
+\r
+if "%ProgramFiles(x86)%" == "" goto bit32\r
+:bit64\r
+ if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
+ set excludes=%excludes% --exclude=/xonotic.exe\r
+ set excludes=%excludes% --exclude=/xonotic-sdl.exe\r
+ set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r
+ set excludes=%excludes% --exclude=/fteqcc/fteqcc.exe\r
+ set excludes=%excludes% --exclude=/bin32\r
+ set excludes=%excludes% --exclude=/*.dll\r
+ goto endbit\r
+:bit32\r
+ set excludes=%excludes% --exclude=/xonotic-x64.exe\r
+ set excludes=%excludes% --exclude=/xonotic-x64-sdl.exe\r
+ set excludes=%excludes% --exclude=/xonotic-x64-dedicated.exe\r
+ set excludes=%excludes% --exclude=/fteqcc/fteqcc-x64.exe\r
+ set excludes=%excludes% --exclude=/bin64\r
+ goto endbit\r
+:endbit\r
+\r
+for %%f in (*.exe *.dll) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
+%TEMP%\xonotic-rsync-updater\rsync %options% %excludes% %url% %target%\r
+%TEMP%\xonotic-rsync-updater\chmod -R a+x %target%\r
+\r
+:end\r
+pause\r
+rmdir /s /q %TEMP%\xonotic-rsync-updater\r
--- /dev/null
+#!/bin/sh
+
+if [ -d "${0%/*}" ]; then
+ cd "${0%/*}"
+fi
+
+if ! which rsync >/dev/null; then
+ echo >&2 "FATAL: rsync not found, please install the rsync package"
+ exit 1
+fi
+
+case "${0##*/}" in
+ update-to-autobuild.sh)
+ buildtype=autobuild
+ ;;
+ *)
+ buildtype=release
+ ;;
+esac
+
+options="-Prtzil --executability --delete-after --delete-excluded --stats"
+
+if [ -d "Xonotic-low" ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ target="Xonotic-low/"
+elif [ -d "Xonotic-high" ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ target="Xonotic-high/"
+elif [ -d "../../../.git" ]; then
+ echo >&2 "NOTE: this is a git repository download. Using the regular update method."
+ exec ../../../all update
+elif [ -d "../../../data" ]; then
+ if [ -f ../../../data/xonotic-rsync-data-low.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ elif [ -f ../../../data/xonotic-*-data-low.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-low/"
+ options="$options -y" # use fuzzy matching because file names differ
+ elif [ -f ../../../data/xonotic-rsync-data-high.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ elif [ -f ../../../data/xonotic-*-data-high.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic-high/"
+ options="$options -y" # use fuzzy matching because file names differ
+ elif [ -f ../../../data/xonotic-rsync-data.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ elif [ -f ../../../data/xonotic-*-data.pk3 ]; then
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ options="$options -y" # use fuzzy matching because file names differ
+ else
+ echo >&2 "FATAL: unrecognized Xonotic build. This update script cannot be used."
+ exit 1
+ fi
+ target="../../.."
+else
+ url="rsync://beta.xonotic.org/$buildtype-Xonotic/"
+ target="Xonotic/"
+fi
+
+excludes=
+if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
+ excludes="$excludes --exclude=/*.exe"
+ excludes="$excludes --exclude=/fteqcc/*.exe"
+ excludes="$excludes --exclude=/bin32"
+ excludes="$excludes --exclude=/*.dll"
+ excludes="$excludes --exclude=/bin64"
+
+ case `uname`:`uname -m` in
+ Darwin:*)
+ excludes="$excludes --exclude=/xonotic-linux*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux*"
+ ;;
+ Linux:x86_64)
+ excludes="$excludes --exclude=/Xonotic*.app"
+ excludes="$excludes --exclude=/xonotic-osx-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+ if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
+ excludes="$excludes --exclude=/xonotic-linux32-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
+ fi
+ ;;
+ Linux:i?86)
+ excludes="$excludes --exclude=/Xonotic*.app"
+ excludes="$excludes --exclude=/xonotic-osx-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
+ excludes="$excludes --exclude=/xonotic-linux64-*"
+ excludes="$excludes --exclude=/fteqcc/fteqcc.linux64"
+ ;;
+ *)
+ echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
+ ;;
+ esac
+fi
+
+rsync $options $excludes "$url" "$target"
+++ /dev/null
-@echo off\r
-\r
-if "%1" == "did-copy" goto copied\r
-cd %~dp0\r
-rmdir /s /q %TEMP%\xonotic-rsync-updater\r
-mkdir %TEMP%\xonotic-rsync-updater\r
-for %%f in (*.exe *.dll *.bat) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
-%TEMP%\xonotic-rsync-updater\update-xonotic did-copy\r
-exit\r
-\r
-:copied\r
-set options=-Prtzil --executability --delete-after --delete-excluded --stats\r
-\r
-if exist Xonotic-low goto xonoticlow\r
-if exist Xonotic-high goto xonotichigh\r
-if exist ..\..\..\.git goto xonoticdatagit\r
-if exist ..\..\..\data goto xonoticdata\r
-goto xonotic\r
-:xonoticlow\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-low/\r
- set target=Xonotic-low/\r
- goto endxonotic\r
-:xonotichigh\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-high/\r
- set target=Xonotic-high/\r
- goto endxonotic\r
-:xonoticdatagit\r
- echo NOTE: this is a git repository download. Using the regular update method.\r
- ..\..\..\all update\r
- goto end\r
-:xonoticdata\r
- if exist ..\..\..\misc\tools\rsync-updater\rsync.exe goto xonoticdatarsync\r
- echo FATAL: rsync not in misc\tools\rsync-updater. This update script cannot be used.\r
- goto end\r
-:xonoticdatarsync\r
- set PATH=misc\tools\rsync-updater;%PATH%\r
- cd ..\..\..\r
- if exist data\xonotic-rsync-data-low.pk3 goto xonoticdatalow\r
- if exist data\xonotic-*-data-low.pk3 goto xonoticdatalowfuzzy\r
- if exist data\xonotic-rsync-data-high.pk3 goto xonoticdatahigh\r
- if exist data\xonotic-*-data-high.pk3 goto xonoticdatahighfuzzy\r
- if exist data\xonotic-rsync-data.pk3 goto xonoticdatanormal\r
- if exist data\xonotic-*-data.pk3 goto xonoticdatanormalfuzzy\r
- echo FATAL: unrecognized Xonotic build. This update script cannot be used.\r
- goto end\r
-:xonoticdatalow\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-low/\r
- goto endxonoticdata\r
-:xonoticdatalowfuzzy\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-low/\r
- set options=%options% -y\r
- goto endxonoticdata\r
-:xonoticdatahigh\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-high/\r
- goto endxonoticdata\r
-:xonoticdatahighfuzzy\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic-high/\r
- set options=%options% -y\r
- goto endxonoticdata\r
-:xonoticdatanormal\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic/\r
- goto endxonoticdata\r
-:xonoticdatanormalfuzzy\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic/\r
- set options=%options% -y\r
- goto endxonoticdata\r
-:endxonoticdata\r
- set target=./\r
- goto endxonotic\r
-:xonotic\r
- set url=rsync://beta.xonotic.org/autobuild-Xonotic/\r
- set target=Xonotic/\r
- goto endxonotic\r
-:endxonotic\r
-\r
-set excludes=\r
-if not "%XONOTIC_INCLUDE_ALL%" == "" goto endbit\r
-set excludes=%excludes% --exclude=/xonotic-linux*\r
-set excludes=%excludes% --exclude=/xonotic-osx-*\r
-set excludes=%excludes% --exclude=/Xonotic*.app\r
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.linux*\r
-set excludes=%excludes% --exclude=/fteqcc/fteqcc.osx\r
-\r
-if "%ProgramFiles(x86)%" == "" goto bit32\r
-:bit64\r
- if not "%XONOTIC_INCLUDE_32BIT%" == "" goto endbit\r
- set excludes=%excludes% --exclude=/xonotic.exe\r
- set excludes=%excludes% --exclude=/xonotic-sdl.exe\r
- set excludes=%excludes% --exclude=/xonotic-dedicated.exe\r
- set excludes=%excludes% --exclude=/fteqcc/fteqcc.exe\r
- set excludes=%excludes% --exclude=/bin32\r
- set excludes=%excludes% --exclude=/*.dll\r
- goto endbit\r
-:bit32\r
- set excludes=%excludes% --exclude=/xonotic-x64.exe\r
- set excludes=%excludes% --exclude=/xonotic-x64-sdl.exe\r
- set excludes=%excludes% --exclude=/xonotic-x64-dedicated.exe\r
- set excludes=%excludes% --exclude=/fteqcc/fteqcc-x64.exe\r
- set excludes=%excludes% --exclude=/bin64\r
- goto endbit\r
-:endbit\r
-\r
-for %%f in (*.exe *.dll) do copy /b %%f %TEMP%\xonotic-rsync-updater\\r
-%TEMP%\xonotic-rsync-updater\rsync %options% %excludes% %url% %target%\r
-%TEMP%\xonotic-rsync-updater\chmod -R a+x %target%\r
-\r
-:end\r
-pause\r
-rmdir /s /q %TEMP%\xonotic-rsync-updater\r
+++ /dev/null
-#!/bin/sh
-
-if [ -d "${0%/*}" ]; then
- cd "${0%/*}"
-fi
-
-if ! which rsync >/dev/null; then
- echo >&2 "FATAL: rsync not found, please install the rsync package"
- exit 1
-fi
-
-options="-Prtzil --executability --delete-after --delete-excluded --stats"
-
-if [ -d "Xonotic-low" ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-low/"
- target="Xonotic-low/"
-elif [ -d "Xonotic-high" ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-high/"
- target="Xonotic-high/"
-elif [ -d "../../../.git" ]; then
- echo >&2 "NOTE: this is a git repository download. Using the regular update method."
- exec ../../../all update
-elif [ -d "../../../data" ]; then
- if [ -f ../../../data/xonotic-rsync-data-low.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-low/"
- elif [ -f ../../../data/xonotic-*-data-low.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-low/"
- options="$options -y" # use fuzzy matching because file names differ
- elif [ -f ../../../data/xonotic-rsync-data-high.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-high/"
- elif [ -f ../../../data/xonotic-*-data-high.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic-high/"
- options="$options -y" # use fuzzy matching because file names differ
- elif [ -f ../../../data/xonotic-rsync-data.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic/"
- elif [ -f ../../../data/xonotic-*-data.pk3 ]; then
- url="rsync://beta.xonotic.org/autobuild-Xonotic/"
- options="$options -y" # use fuzzy matching because file names differ
- else
- echo >&2 "FATAL: unrecognized Xonotic build. This update script cannot be used."
- exit 1
- fi
- target="../../.."
-else
- url="rsync://beta.xonotic.org/autobuild-Xonotic/"
- target="Xonotic/"
-fi
-
-excludes=
-if [ -z "$XONOTIC_INCLUDE_ALL" ]; then
- excludes="$excludes --exclude=/*.exe"
- excludes="$excludes --exclude=/fteqcc/*.exe"
- excludes="$excludes --exclude=/bin32"
- excludes="$excludes --exclude=/*.dll"
- excludes="$excludes --exclude=/bin64"
-
- case `uname`:`uname -m` in
- Darwin:*)
- excludes="$excludes --exclude=/xonotic-linux*"
- excludes="$excludes --exclude=/fteqcc/fteqcc.linux*"
- ;;
- Linux:x86_64)
- excludes="$excludes --exclude=/Xonotic*.app"
- excludes="$excludes --exclude=/xonotic-osx-*"
- excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
- if [ -z "$XONOTIC_INCLUDE_32BIT" ]; then
- excludes="$excludes --exclude=/xonotic-linux32-*"
- excludes="$excludes --exclude=/fteqcc/fteqcc.linux32"
- fi
- ;;
- Linux:i?86)
- excludes="$excludes --exclude=/Xonotic*.app"
- excludes="$excludes --exclude=/xonotic-osx-*"
- excludes="$excludes --exclude=/fteqcc/fteqcc.osx"
- excludes="$excludes --exclude=/xonotic-linux64-*"
- excludes="$excludes --exclude=/fteqcc/fteqcc.linux64"
- ;;
- *)
- echo >&2 "WARNING: Could not detect architecture - downloading all architectures"
- ;;
- esac
-fi
-
-rsync $options $excludes "$url" "$target"
url_ssh=xonotic-beta:autobuild-bsp/
build_cachedir="$HOME/xonotic-map-compiler.cache/"
screenshot_cachedir="$HOME/xonotic-map-screenshot.cache/"
-build_override="-bsp_timeout 1800 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
+build_override="-bsp_timeout 5400 -vis_timeout 3600 -light_timeout 14400 -minimap_timeout 900 -scale_timeout 900"
screenshot_override="9 900 5 +g_ctf 1"
getthemap_fail=false
continue
fi
- rm -rf ~/.xonotic
- mkdir -p ~/.xonotic
+ rm -rf ~/.xonotic/data
+ mkdir -p ~/.xonotic/data
(
cd ../..
if [ -n "$DISPLAY" ]; then
;;
esac
fi
- ) >~/.xonotic/autoscreenshot.log 2>&1
- if ! mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
- if [ -n "$IRCSPAM" ]; then
- #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > "maps/$M.ircss"
- fi
- return 1
- fi
- mv ~/.xonotic/autoscreenshot.log "$M-$blobhash"/ || true
- if [ -n "$IRCSPAM" ]; then
- #ss2spam "$M" "$url$M-$blobhash/" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
- ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > "maps/$M.ircss"
+ ) 2>&1 | tee ~/.xonotic/data/autoscreenshot.log
+ good=false
+ if mv ~/.xonotic/data/screenshots "$M-$blobhash"; then
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 0 > ~/.xonotic/data/"$M.ircss"
+ else
+ mkdir "$M-$blobhash"
+ ss2spam "$M" "$url?d" "$REFNAME" "$commithash" 1 > ~/.xonotic/data/"$M.ircss"
fi
+ mv ~/.xonotic/data/"$M.ircss" "$M-$blobhash"/
+ mv ~/.xonotic/data/autoscreenshot.log "$M-$blobhash"/
chmod 1777 "$M-$blobhash"
ln -snf "../$M-$blobhash" "$M" # from ALL branches, so beware!
rsync -vaSHP "$M-$blobhash" "$url_ssh"
rsync -vaSHP "$M" "$url_ssh""latest/"
if [ -n "$IRCSPAM" ]; then
- $IRCSPAM < "maps/$M.ircss"
+ $IRCSPAM < "$M-$blobhash/$M.ircss"
fi
}
+'locksession 0' \
+'scr_screenshot_timestamp 0' \
+'vid_fullscreen 0' \
- +'exec effects-ultimate.cfg' \
+ +'exec effects-ultra.cfg' \
"$@" \
+ +'sv_precacheplayermodels 0' \
+'r_motionblur 0' \
+'r_damageblur 0' \
+'r_letterbox -1' \
#dp_listen_from_server =
#dp_status_delay = 30
#dp_utf8_enable = 1
+#dp_timinglog = timing.log
#irc_reconnect_delay = 300
#irc_admin_timeout = 3600
#irc_admin_quote_re =
dp_server_from_wan => "",
dp_listen_from_server => "",
dp_utf8_enable => $color_utf8_enable,
+ dp_timinglog => "",
irc_local => "",
irc_admin_password => "",
my ($all, $cpu, $lost, $avg, $max, $sdev) = @_;
return 0 # don't complain when just on the voting screen
if !$store{playing};
+ if(length $config{dp_timinglog})
+ {
+ open my $fh, '>>', $config{dp_timinglog}
+ or warn "open >> $config{dp_timinglog}: $!";
+ print $fh "@{[time]} $cpu $lost $avg $max $sdev $store{slots_active}\n"
+ or warn "print >> $config{dp_timinglog}: $!";
+ close $fh
+ or warn "close >> $config{dp_timinglog}: $!";
+ }
return 0 # don't complain if it was less than 0.5%
if $lost < 0.5;
return 0 # don't complain if nobody is looking
projects / xonotic / xonotic.git / commitdiff