fi
cd ..
done
-d0=`pwd`
+export d0=`pwd`
SELF="$d0/all"
# If we are on WINDOWS:
mkdir -p Xonotic
git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
cd Xonotic
- mkdir data fteqcc
+ mkdir data fteqcc darkplaces-src fteqcc-src
tar xvf -
rm -rf misc/builddeps
- mv misc/buildfiles/win32/* .
- mv misc/buildfiles/win64/* .
- mv misc/buildfiles/osx/* .
+ mv misc/buildfiles/win32/* . || true
+ mv misc/buildfiles/win64/* . || true
+ mv misc/buildfiles/osx/* . || true
rm -rf misc/buildfiles
}
+ {
+ cd darkplaces
+ git archive --format=tar HEAD
+ } | {
+ cd Xonotic/darkplaces-src
+ tar xvf -
+ }
+ {
+ cd fteqcc
+ git archive --format=tar HEAD
+ } | {
+ cd Xonotic/fteqcc-src
+ tar xvf -
+ }
;;
release-compile-run)
host=$1
rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
(
cd $buildpath
- eval make clean $maketargets $makeflags
+ verbose eval make clean $maketargets $makeflags
)
for f in $targetfiles; do
- mv "$buildpath/${f%:*}" "${f##*:}"
+ verbose mv "$buildpath/${f%:*}" "${f##*:}"
done
;;
*)
rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
- ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+ verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
for f in $targetfiles; do
- rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+ verbose rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
done
;;
esac
fteqcc_files=$4
darkplaces_maketargets=$5
darkplaces_files=$6
- "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
- "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files"
+ "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/fteqcc-src" "$fteqcc_files"
+ "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/darkplaces-src" "$darkplaces_files"
;;
release-engine-win32)
"$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"' \
+ '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"' \
win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
- debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+ debug 'darkplaces.exe:Xonotic/xonotic.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated.exe'
;;
release-engine-win64)
"$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=""' \
+ '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-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-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'
;;
release-engine-osx)
"$SELF" release-compile osx \
;;
release-maps)
"$SELF" update-maps
- for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
- if [ -f "$X" ]; then
- cd Xonotic/data/xonotic-maps.pk3dir
- unzip ../../../"$X"
- cd ../../..
- fi
- done
;;
release-finish)
# version numnber and stuff like that
cp "$src"/csprogs.dat Xonotic/temp/
cp "$src"/menu.dat Xonotic/temp/
fi
+ if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+ for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+ if [ -f "$X" ]; then
+ (
+ cd Xonotic/data/xonotic-maps.pk3dir
+ unzip ../../../"$X"
+ )
+ fi
+ done
+ fi
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
cd Xonotic/temp
zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
done
;;
release-pack)
- "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
+ "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw ''
"$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
"$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
"$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
;;
+ release-pack-needsx11)
+ case "$DISPLAY" in
+ '')
+ startx "$SELF" release-pack -- /usr/bin/Xvfb :7
+ ;;
+ *)
+ "$SELF" release-pack
+ ;;
+ esac
+ ;;
release)
"$SELF" release-prepare
- "$SELF" release-engine
- "$SELF" release-maps
- "$SELF" release-finish
- "$SELF" release-qc
- "$SELF" release-pack
+ "$SELF" release-maps &
+ "$SELF" release-engine &
+ "$SELF" release-finish &
+ "$SELF" release-qc &
+ wait
+ "$SELF" release-pack-needsx11
;;
*)
projects / xonotic / xonotic.git / blobdiff