X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=all;h=06101152eda1e38c3aa8f0a81b6a294f1735774b;hb=501f9c229ffbe74c044771a4ee26ba2bcf66ad3b;hp=cca966437184ca277c8ba0933bd5df0212f4dddd;hpb=3c9f2bd0cecdf01dc946eece08a2007f5b929a9b;p=xonotic%2Fxonotic.git diff --git a/all b/all index cca96643..06101152 100755 --- a/all +++ b/all @@ -108,7 +108,10 @@ yesno() while [ x"$yesno" != x"y" -a x"$yesno" != x"n" ]; do eval "$2" $ECHO "$1" - IFS= read -r yesno + if ! IFS= read -r yesno; then + yesno=n + break + fi done [ x"$yesno" = x"y" ] } @@ -235,7 +238,7 @@ listrepos() fi # if we have .no file, skip if [ -f "$d.no" ]; then - msg "Repository $d disabled by a .no file, delete $p.no to enable" + msg "Repository $d disabled by a .no file, delete $d.no to enable" continue fi # if we have matching pk3, skip @@ -264,6 +267,12 @@ fi cmd=$1 shift +case "$cmd" in + release-*) + export LC_ALL=C + ;; +esac + fix_upstream_rebase() { if [ -z "$r_me" ] || [ -z "$r_other" ]; then @@ -346,10 +355,20 @@ fix_git_config() verbose git config filter.mapclean.smudge "cat" } +mkzipr() +{ + archive=$1; shift + find "$@" -exec touch -d "1970-01-01 00:00:00 +0000" {} \+ # ugly hack to make the pk3 files rsync-friendly + 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 + rm -f "$ziplist" +} + mkzip() { - archive=$1 - shift + archive=$1; shift ziplist=`mktemp` find "$@" -xtype f \( -executable -or -type l \) -print > "$ziplist" 7za a -tzip -mx=9 -x@"$ziplist" "$archive" "$@" || true @@ -359,7 +378,8 @@ mkzip() mkzip0() { - zip -0y "$@" + archive=$1; shift + zip -0ry "$archive" "$@" } mirrorspeed() @@ -376,6 +396,7 @@ bestmirror() suf=$1; shift if ! { time -p true; } >/dev/null 2>&1; then + msg "Cannot do timing in this shell" return 1 fi @@ -543,7 +564,6 @@ case "$cmd" in case "$location" in current) if [ x"`git config xonotic.all.mirrorselection 2>/dev/null || true`" != x"done" ]; then - git config xonotic.all.mirrorselection done location=best fi ;; @@ -561,7 +581,7 @@ case "$cmd" in case "$newbase" in *\ *) if location=`bestmirror $newbase"xonotic.git" de us nl:'*6/5'`; then # 20% malus to the NL server to not overload it too much - : + git config xonotic.all.mirrorselection done else location=current fi @@ -608,6 +628,11 @@ case "$cmd" in pushurl=`repopushurl "$d"` branch=`repobranch "$d"` if [ -d "$d0/$d" ]; then + # if we have .no file, skip + if [ -f "$d0/$d.no" ]; then + msg "Repository $d disabled by a .no file, delete $d.no to enable; thus, not updated" + continue + fi if $allow_pull; then enter "$d0/$d" verbose r=`git symbolic-ref HEAD` @@ -847,8 +872,15 @@ case "$cmd" in cleanqc=true shift ;; - -r) - debug=release + -r|-p) + case "$1" in + -p) + debug=profile + ;; + -r) + debug=release + ;; + esac export CC="$CC -g" case "`$CC -dumpversion`" in [5-9]*|[1-9][0-9]*|4.[3-9]*|4.[1-9][0-9]*) @@ -934,7 +966,7 @@ case "$cmd" in fi fi - enter "$d0/d0_blind_id" verbose + verbose cd "$d0/d0_blind_id" if ! $compiled0; then # compilation of crypto library failed # use binaries then, if we can... @@ -987,20 +1019,20 @@ case "$cmd" in verbose make $MAKEFLAGS fi - enter "$d0/fteqcc" verbose + verbose cd "$d0/fteqcc" if $cleanqcc; then verbose make $MAKEFLAGS clean fi verbose make $MAKEFLAGS - enter "$d0/data/xonotic-data.pk3dir" verbose + verbose cd "$d0/data/xonotic-data.pk3dir" if $cleanqc; then verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS clean fi verbose make FTEQCC="../../../../fteqcc/fteqcc.bin" "$@" $MAKEFLAGS # 4 levels up: data, xonotic-data, qcsrc, server - enter "$d0/darkplaces" verbose + verbose cd "$d0/darkplaces" if [ x"$BAD_TARGETS" = x" " ]; then $ECHO "Warning: invalid empty client, default clients will be used." fi @@ -1046,7 +1078,7 @@ case "$cmd" in exit 1 fi fi - set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@" + set -- "darkplaces/darkplaces$client" -xonotic "$@" # if pulseaudio is running: USE IT if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then @@ -1587,7 +1619,7 @@ case "$cmd" in *) verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/" verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/" - verbose ssh "$host" "ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" + verbose ssh "$host" "export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags" for f in $targetfiles; do verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true done @@ -1599,15 +1631,6 @@ case "$cmd" in case "${f##*:}" in Xonotic/xonotic*.exe) verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "${f##*:}" - ( - d=`mktemp -d -t rebrand.XXXXXX` - cd "$d" - $ECHO "-mygames" > darkplaces.opt - zip -9r darkplaces.zip darkplaces.opt - cat darkplaces.zip - cd "$d0" - rm -rf "$d" - ) >> "${f##*:}" ;; esac done @@ -1814,7 +1837,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 mkzipr "../../$dst" * verbose cd ../.. verbose rm -rf Xonotic/temp ;; @@ -1902,8 +1925,9 @@ case "$cmd" in Xonotic/data/xonotic-$stamp-maps-high.pk3 \ Xonotic/data/xonotic-$stamp-music.pk3 \ Xonotic/data/xonotic-$stamp-nexcompat-high.pk3 - verbose mkzip0 Xonotic-$stamp-mappingsuppport.zip \ - Xonotic/mapping \ + verbose mkzip Xonotic-$stamp-mappingsupport.zip \ + Xonotic/mapping + verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \ Xonotic/data/xonotic-$stamp-maps-low.pk3 # TODO add a Radiant build ;; release) @@ -1925,7 +1949,7 @@ case "$cmd" in $ECHO " $SELF checkout|switch /" $ECHO " $SELF clean [-m] [-f | -fu | -fU] [-r] [-D]" $ECHO " $SELF clean --reclone" - $ECHO " $SELF compile [-c] [-r] [-0]" + $ECHO " $SELF compile [-c] [-r|-p] [-0]" $ECHO " $SELF each|foreach [-k] command..." $ECHO " $SELF fix_upstream_rebase" $ECHO " $SELF keygen"