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
+ enter "$d0/$d" verbose
+ if $force; then
+ 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)
verbose tar xvf -
verbose rm -rf misc/builddeps
verbose mv misc/buildfiles/win32/* . || true
- verbose mv misc/buildfiles/win64/* . || true
+ verbose mv misc/buildfiles/win64 bin64 || true
verbose mv misc/buildfiles/osx/* . || true
verbose rm -rf misc/buildfiles
}
targetfiles=$6
case " $HOSTS_THAT_ARE_MYSELF " in
*\ $host\ *)
- verbose rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
+ 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 -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
+ verbose rsync --delete -zvaSHP "$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##*:}" || true
+ verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
done
;;
esac
;;
release-engine-win32)
verbose "$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"' \
+ 'STRIP=: DP_MAKE_TARGET=mingw CC="i586-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -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"' \
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)
verbose "$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'
+ 'STRIP=: DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -g -Wl,--dynamicbase -Wl,--nxcompat -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-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)
+ # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
verbose "$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"' \
+ 'STRIP=: 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 -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-osx-dedicated'
;;
release-engine-linux32)
verbose "$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' \
+ '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 DP_LINK_TO_LIBJPEG=1' \
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)
verbose "$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' \
+ '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 DP_LINK_TO_LIBJPEG=1' \
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)
+ verbose "$SELF" release-engine-osx
verbose "$SELF" release-engine-win32
- # "$SELF" release-engine-win64
- # "$SELF" release-engine-osx
+ verbose "$SELF" release-engine-win64
verbose "$SELF" release-engine-linux32
verbose "$SELF" release-engine-linux64
;;
verbose export ogg_qual=1
verbose export del_src=true
find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
- if [ -f "quake.rc" ]; then
- verbose echo "r_texture_dds_load 1" >> quake.rc
- fi
;;
release-buildpk3)
src=$1
;;
release-zip)
stamp=`cat Xonotic/stamp.txt`
- verbose zip -9yr Xonotic-common.zip \
+ verbose zip -9yr Xonotic-$stamp-common.zip \
Xonotic/*.dll \
Xonotic/source/*/ \
Xonotic/Docs \
Xonotic/xonotic-* \
Xonotic/xonotic.exe \
Xonotic/data/font-nimbussansl-$stamp.pk3
- verbose cp Xonotic-common.zip Xonotic.zip
- verbose zip -0yr Xonotic.zip \
+ verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
+ verbose zip -0yr 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
- verbose cp Xonotic-common.zip Xonotic-low.zip
- verbose zip -0yr Xonotic-low.zip \
+ verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-low.zip
+ verbose zip -0yr 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
- verbose cp Xonotic-common.zip Xonotic-lowdds.zip
- verbose zip -0yr Xonotic-lowdds.zip \
+ verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp-lowdds.zip
+ verbose zip -0yr 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
- verbose mv Xonotic-common.zip Xonotic-high.zip
- verbose zip -0yr Xonotic-high.zip \
+ verbose mv Xonotic-$stamp-common.zip Xonotic-$stamp-high.zip
+ verbose zip -0yr Xonotic-$stamp-high.zip \
Xonotic/data/xonotic-$stamp-data-raw.pk3 \
Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
Xonotic/data/xonotic-$stamp-music.pk3 \
projects / xonotic / xonotic.git / blobdiff