]> git.xonotic.org Git - xonotic/xonotic.git/blobdiff - all
put qcsrc in the right place
[xonotic/xonotic.git] / all
diff --git a/all b/all
index 874d4f39a15d3c88638715448c5e1333531035a9..3cf531cb8ae654b2755efc0831918df8f6968aa8 100755 (executable)
--- a/all
+++ b/all
@@ -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 -
                }
                ;;
@@ -903,17 +910,21 @@ case "$cmd" in
                                        verbose eval make 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
@@ -922,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 \
@@ -966,9 +977,6 @@ case "$cmd" in
        release-maps)
                "$SELF" update-maps
                ;;
-       release-finish)
-               # version number and stuff like that
-               ;;
        release-qc)
                verbose make -C data/xonotic-data.pk3dir FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK=
                ;;
@@ -1008,6 +1016,9 @@ case "$cmd" in
                # texture: convert to jpeg and dds
                # music: reduce bitrate
                export do_jpeg=false
+               export do_jpeg_if_not_dds=true
+               export jpeg_qual_rgb=80
+               export jpeg_qual_a=95
                export do_dds=true
                export dds_flags=
                export do_ogg=true
@@ -1042,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))
@@ -1065,9 +1065,19 @@ 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 -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+               zip -9yr "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
                cd ../..
                rm -rf Xonotic/temp
                ;;
@@ -1078,7 +1088,7 @@ case "$cmd" in
                dst=${src%.pk3dir}
                case "$dst" in
                        data/xonotic-*)
-                               dst="xonotic-$stamp-${dst#data/xonotic-}"
+                               dst="data/xonotic-$stamp-${dst#data/xonotic-}"
                                ;;
                        *)
                                dst="$dst-$stamp"
@@ -1108,50 +1118,49 @@ case "$cmd" in
                esac
                ;;
        release-zip)
-               zip -9r Xonotic-common.zip \
+               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 \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \
-                       Xonotic/data/font-nimbussansl.pk3
+                       Xonotic/xonotic.exe \
+                       Xonotic/data/font-nimbussansl-$stamp.pk3
                cp Xonotic-common.zip Xonotic.zip
-               zip -0r Xonotic.zip \
-                       Xonotic/data/xonotic-data.pk3 \
-                       Xonotic/data/xonotic-maps.pk3 \
-                       Xonotic/data/xonotic-music.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+               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 \
-                       Xonotic/data/xonotic-data-low.pk3 \
-                       Xonotic/data/xonotic-maps-low.pk3 \
-                       Xonotic/data/xonotic-music-low.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
+               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 \
-                       Xonotic/data/xonotic-data-lowdds.pk3 \
-                       Xonotic/data/xonotic-maps-lowdds.pk3 \
-                       Xonotic/data/xonotic-music-low.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
-               cp Xonotic-common.zip Xonotic-high.zip
-               zip -0r Xonotic-high.zip \
-                       Xonotic/data/xonotic-data-raw.pk3 \
-                       Xonotic/data/xonotic-maps-raw.pk3 \
-                       Xonotic/data/xonotic-music.pk3 \
-                       Xonotic/data/xonotic-nexcompat.pk3
-               rm -f Xonotic-common.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
+               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
                ;;
        release)
                "$SELF" release-prepare
                "$SELF" release-maps &
                "$SELF" release-engine &
-               "$SELF" release-finish &
-               "$SELF" release-qc &
                wait
+               "$SELF" release-qc
                "$SELF" release-pack-needsx11
                "$SELF" release-zip
                ;;