fix DLL path when building zip. DLLroll'd.

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bcb963ea1e6f906de6bcf0c3bd670efb2d6eb475..8a48f83e400ef9c25ff7cea6d19e365b800071e4 100755 (executable)
--- a/all
+++ b/all
@@ -295,13 +295,27 @@ case "$cmd" in
                {
                        release_src=$1; shift
                        release_dst=$1; shift
-                       {
-                               verbose cd "$release_src"
-                               verbose git archive --format=tar HEAD -- "$@"
-                       } | {
-                               verbose cd "$release_dst"
-                               verbose tar xvf -
-                       }
+                       # try to create a hardlink
+                       if ln -f "$release_src/.git/HEAD" "$release_dst/.hardlink-test"; then
+                               rm -f "$release_dst/.hardlink-test"
+                               {
+                                       verbose cd "$release_src"
+                                       git ls-files HEAD -- "$@"
+                               } | {
+                                       while IFS= read -r F; do
+                                               case "$F" in */*) mkdir -p "$release_dst/${F%/*}" ;; esac
+                                               verbose ln -f "$release_src/$F" "$release_dst/$F"
+                                       done
+                               }
+                       else
+                               {
+                                       verbose cd "$release_src"
+                                       verbose git archive --format=tar HEAD -- "$@"
+                               } | {
+                                       verbose cd "$release_dst"
+                                       verbose tar xvf -
+                               }
+                       fi
                }
                ;;
 esac
@@ -1603,10 +1617,10 @@ case "$cmd" in
                        verbose rm -rf misc/buildfiles
                        verbose rm -rf misc/pki
                )
-               release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces"
-               release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc"
+               release_git_extract_dir "darkplaces" "Xonotic/source/darkplaces" .
+               release_git_extract_dir "fteqcc" "Xonotic/source/fteqcc" .
                release_git_extract_dir "data/xonotic-data.pk3dir" "Xonotic/source" qcsrc Makefile
-               release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id"
+               release_git_extract_dir "d0_blind_id" "Xonotic/source/d0_blind_id" .
                (
                        verbose cd Xonotic/source/d0_blind_id
                        verbose sh autogen.sh
@@ -1813,7 +1827,7 @@ case "$cmd" in
                verbose rm -rf Xonotic/temp
                release_timereport "deleted temp directory"
                verbose mkdir -p Xonotic/temp
-               release_git_extract_dir "$src" "Xonotic/temp"
+               release_git_extract_dir "$src" "Xonotic/temp" .
                release_timereport "extracted data"
                verbose cd Xonotic/temp
                if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
@@ -1833,11 +1847,12 @@ case "$cmd" in
                                        versionstr="$versionstr$RELEASETYPE"
                                        ;;
                        esac
-                       verbose sed -i "
+                       verbose sed "
                                s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /;
                                s/^gameversion_min [0-9]*/gameversion_min $(( ($gv / 100) * 100 - 100 ))/;
                                s/^gameversion_max [0-9]*/gameversion_max $(( ($gv / 100) * 100 + 199 ))/;
-                       " defaultXonotic.cfg
+                       " < defaultXonotic.cfg > defaultXonotic.cfg.new
+                       mv defaultXonotic.cfg.new defaultXonotic.cfg
                        case "$RELEASETYPE" in
                                release)
                                        echo "" >> defaultXonotic.cfg
@@ -1847,6 +1862,7 @@ case "$cmd" in
                        esac
                        (
                                verbose cd gfx/menu/luminos
+                               verbose rm -f background_l2.tga background_ingame_l2.tga
                                verbose cp "$d0"/mediasource/gfx/menu/luminos_versionbuilder/background_l2.svg .
                                verbose "$d0"/mediasource/gfx/menu/luminos_versionbuilder/versionbuilder "$versionstr"
                                verbose rm background_l2.svg
@@ -1920,7 +1936,7 @@ case "$cmd" in
                fi
                # build the archives
                verbose mkzip Xonotic-$stamp-engine.zip \
-                       Xonotic/*.dll \
+                       Xonotic/bin32/*.dll \
                        Xonotic/bin64/*.dll \
                        Xonotic/*.app \
                        Xonotic/xonotic-* \