X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=f9b864ee797e541223f4d90ff3994391bc587e3d;hp=41040a1290bb0e4105a164454fca0d755818123d;hb=a1904f5972d57ebad51806496221a3017e365f4c;hpb=ad9d4b2c72a3532bca59b988ceb10b7601b49de6 diff --git a/all b/all index 41040a12..f9b864ee 100755 --- a/all +++ b/all @@ -278,8 +278,8 @@ mkzip() shift ziplist=`mktemp` find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist" - 7za a -tzip -mx=9 -x@"$ziplist" "$archive" || true - zip -9y -@<"$ziplist" "$archive" || true + 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true + zip -9y -@<"$ziplist" "$archive" || true rm -f "$ziplist" } @@ -1227,7 +1227,7 @@ case "$cmd" in fi verbose export git_src_repo="$d0/$src" # skip hash-object verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp" - verbose mkzip "../../$dst" . + verbose mkzip "../../$dst" * verbose cd ../.. verbose rm -rf Xonotic/temp ;; @@ -1269,6 +1269,8 @@ case "$cmd" in ;; release-zip) stamp=`cat Xonotic/stamp.txt` + # exe and dll files do not need +x, so this makes them eligible for 7zip compression too + chmod a-x *.exe *.dll # need to use infozip for these (+x bits) verbose mkzip Xonotic-$stamp-engine.zip \ Xonotic/*.dll \