put qcsrc in the right place

This commit is contained in:
Rudolf Polzer 2010-08-06 09:27:05 +02:00
parent 57b4f2c2a7
commit 68d15718f4

43
all
View File

@ -865,7 +865,7 @@ case "$cmd" in
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
@ -877,14 +877,21 @@ case "$cmd" in
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 -
}
;;
@ -926,8 +933,8 @@ case "$cmd" in
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 \
@ -1046,18 +1053,7 @@ case "$cmd" in
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
rm -rf qcsrc
gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
major=$(($gv / 10000))
minor=$(($gv / 100 - $major * 100))
@ -1069,6 +1065,16 @@ case "$cmd" in
" 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
(
cd Xonotic/temp
unzip ../../"$X"
)
fi
done
fi
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
cd Xonotic/temp
zip -9yr "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
@ -1115,9 +1121,8 @@ case "$cmd" in
stamp=`cat Xonotic/stamp.txt`
zip -9yr Xonotic-common.zip \
Xonotic/*.dll \
Xonotic/darkplaces-src \
Xonotic/source \
Xonotic/Docs \
Xonotic/fteqcc-src \
Xonotic/misc \
Xonotic/fteqcc \
Xonotic/server \