date +%Y%m%d > Xonotic/stamp.txt
git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
cd Xonotic
- mkdir data fteqcc darkplaces-src fteqcc-src
+ mkdir data fteqcc source source/darkplaces source/fteqcc
tar xvf -
rm -rf misc/builddeps
mv misc/buildfiles/win32/* . || true
cd darkplaces
git archive --format=tar HEAD
} | {
- cd Xonotic/darkplaces-src
+ cd Xonotic/source/darkplaces
tar xvf -
}
{
cd fteqcc
git archive --format=tar HEAD
} | {
- cd Xonotic/fteqcc-src
+ cd Xonotic/source/fteqcc
+ tar xvf -
+ }
+ {
+ cd data/xonotic-data.pk3dir
+ git archive --format=tar HEAD -- qcsrc
+ } | {
+ cd Xonotic/source
tar xvf -
}
;;
case " $HOSTS_THAT_ARE_MYSELF " in
*\ $host\ *)
rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
- (
- cd $buildpath
- verbose eval make clean $maketargets $makeflags
- )
+ verbose eval make -C "$buildpath" clean $maketargets $makeflags
for f in $targetfiles; do
- verbose mv "$buildpath/${f%:*}" "${f##*:}"
+ verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
done
;;
*)
rsync --delete -zvaSHPAX "$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##*:}"
+ verbose rsync -zvaSHPAX "$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
;;
release-compile)
suffix=$1
fteqcc_files=$4
darkplaces_maketargets=$5
darkplaces_files=$6
- "$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"
+ "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "Xonotic/source/fteqcc" "$fteqcc_files"
+ "$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "Xonotic/source/darkplaces" "$darkplaces_files"
;;
release-engine-win32)
"$SELF" release-compile win32 \
debug 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
;;
release-engine)
- "$SELF" release-engine-win32 &
- "$SELF" release-engine-win64 &
- "$SELF" release-engine-osx &
- "$SELF" release-engine-linux32 &
- "$SELF" release-engine-linux64 &
- wait
+ "$SELF" release-engine-win32
+ # "$SELF" release-engine-win64
+ # "$SELF" release-engine-osx
+ "$SELF" release-engine-linux32
+ "$SELF" release-engine-linux64
;;
release-maps)
"$SELF" update-maps
cd Xonotic/temp
tar xvf -
}
+ cd Xonotic/temp
if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
- cp "$src"/progs.dat Xonotic/temp/
- 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/temp
- unzip ../../"$X"
- )
- fi
- done
- fi
- if [ -f "defaultXonotic.cfg" ]; then
+ cp "$d0/$src"/progs.dat .
+ cp "$d0/$src"/csprogs.dat .
+ cp "$d0/$src"/menu.dat .
+ rm -rf qcsrc
gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
major=$(($gv / 10000))
minor=$(($gv / 100 - $major * 100))
s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
" defaultXonotic.cfg
- echo "r_texture_dds_load 1" >> quake.rc
+ fi
+ if [ x"$src" = x"data/xonotic-maps.pk3dir" ]; then
+ for X in ../../data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+ if [ -f "$X" ]; then
+ unzip "$X"
+ fi
+ done
fi
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
- cd Xonotic/temp
- zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+ zip -9yr "../../$dst" .
cd ../..
rm -rf Xonotic/temp
;;
;;
release-zip)
stamp=`cat Xonotic/stamp.txt`
- zip -9r Xonotic-common.zip \
+ zip -9yr Xonotic-common.zip \
Xonotic/*.dll \
- Xonotic/darkplaces-src \
+ Xonotic/source \
Xonotic/Docs \
- Xonotic/fteqcc-src \
Xonotic/misc \
Xonotic/fteqcc \
Xonotic/server \
Xonotic/*.app \
Xonotic/xonotic-* \
+ Xonotic/xonotic.exe \
Xonotic/data/font-nimbussansl-$stamp.pk3
cp Xonotic-common.zip Xonotic.zip
- zip -0r Xonotic.zip \
+ zip -0yr Xonotic.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
cp Xonotic-common.zip Xonotic-low.zip
- zip -0r Xonotic-low.zip \
+ zip -0yr Xonotic-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
cp Xonotic-common.zip Xonotic-lowdds.zip
- zip -0r Xonotic-lowdds.zip \
+ zip -0yr Xonotic-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
- cp Xonotic-common.zip Xonotic-high.zip
- zip -0r Xonotic-high.zip \
+ mv Xonotic-common.zip Xonotic-high.zip
+ zip -0yr Xonotic-high.zip \
Xonotic/data/xonotic-$stamp-data-raw.pk3 \
Xonotic/data/xonotic-$stamp-maps-raw.pk3 \
Xonotic/data/xonotic-$stamp-music.pk3 \
Xonotic/data/xonotic-$stamp-nexcompat.pk3
- rm -f Xonotic-common.zip
;;
release)
"$SELF" release-prepare
- "$SELF" release-maps &
- "$SELF" release-engine &
- wait
+ "$SELF" release-maps
+ "$SELF" release-engine
"$SELF" release-qc
"$SELF" release-pack-needsx11
"$SELF" release-zip