X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=all;h=75454a32e56b79a78b0a8ca79547486805160769;hb=0b93be16737851b339afbacb27f3f0aafe74a9d7;hp=a1164dc792c7101679e4f8961554dec3db34fc82;hpb=097022097f40ca485b4b7b96a770ca5606aff0af;p=xonotic%2Fxonotic.git diff --git a/all b/all index a1164dc7..75454a32 100755 --- a/all +++ b/all @@ -224,10 +224,9 @@ listrepos() for d in $repos; do p="${d%dir}" f="`repoflags "$d"`" - # if we have the dir, always keep it - if [ -d "$d" ]; then - msg "Repository $d enabled because it already exists" - $ECHO "$d" + # if we have .no file, skip + if [ -f "$d.no" ]; then + msg "Repository $d disabled by a .no file, delete $d.no to enable" continue fi # if .yes file exists, always keep it @@ -236,9 +235,10 @@ listrepos() $ECHO "$d" continue fi - # if we have .no file, skip - if [ -f "$d.no" ]; then - msg "Repository $d disabled by a .no file, delete $d.no to enable" + # if we have the dir, always keep it + if [ -d "$d" ]; then + msg "Repository $d enabled because it already exists" + $ECHO "$d" continue fi # if we have matching pk3, skip @@ -583,29 +583,30 @@ case "$cmd" in ;; update|pull) allow_pull=true - fix_config=false location=current + oldbase=$base + oldpushbase=$pushbase + # transition old URLs + if [ x"$base" = x"ssh://xonotic@push.git.xonotic.org/" ]; then + base=ssh://xonotic@push.git.xonotic.org/ + fi while :; do if [ x"$1" = x"-N" ]; then allow_pull=false elif [ x"$1" = x"-p" ]; then - fix_config=true - pushbase=ssh://xonotic@git.xonotic.org/ + pushbase=ssh://xonotic@push.git.xonotic.org/ elif [ x"$1" = x"-ps" ]; then - fix_config=true - pushbase=ssh://xonotic@git.xonotic.org/ + pushbase=ssh://xonotic@push.git.xonotic.org/ elif [ x"$1" = x"-ph" ]; then - fix_config=true - pushbase=http://git.xonotic.org/login/xonotic/ + pushbase=http://push.git.xonotic.org/login/xonotic/ elif [ x"$1" = x"-s" ]; then - fix_config=true - base=ssh://xonotic@git.xonotic.org/ + base=ssh://xonotic@push.git.xonotic.org/ elif [ x"$1" = x"-g" ]; then - fix_config=true base=git://git.xonotic.org/xonotic/ + location=best elif [ x"$1" = x"-h" ]; then - fix_config=true base=http://git.xonotic.org/xonotic/ + location=best elif [ x"$1" = x"-l" ]; then case "$2" in nl) ;; @@ -624,7 +625,6 @@ case "$cmd" in exit 1 ;; esac - fix_config=true location=$2 shift else @@ -681,17 +681,16 @@ case "$cmd" in esac if [ -n "$location" ]; then base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"` - pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://$location.git.xonotic.org/,"` else base=`$ECHO "$base" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"` - pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://git.xonotic.org/,"` fi - if $fix_config; then + pushbase=`$ECHO "$pushbase" | sed "s,://\(.*\.\)\?git.xonotic.org/,://xonotic@push.git.xonotic.org/,"` + if [ x"$base" != x"$oldbase" ] || [ x"$pushbase" != x"$oldpushbase" ]; then url=`repourl .` pushurl=`repopushurl .` fix_git_config "$url" "$pushurl" - fi - if $allow_pull || $fix_config; then + "$SELF" fix_config + elif $allow_pull; then "$SELF" fix_config fi for d in $repos; do @@ -1035,7 +1034,7 @@ case "$cmd" in fi if [ -z "$MAKEFLAGS" ]; then if [ -f /proc/cpuinfo ]; then - ncpus=$((`grep -c '^processor :' /proc/cpuinfo`+0)) + ncpus=$((`grep -c '^processor :' /proc/cpuinfo || true`+0)) if [ $ncpus -gt 1 ]; then MAKEFLAGS=-j$ncpus fi @@ -1052,13 +1051,13 @@ case "$cmd" in msg "~~~~~~~~~~ COMPILER ~~~~~~~~~~" msg "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" msg "~~~~~~~~~~~~~~_...._~~~~~~~~~~" - msg "~~~~~~~~~~~,-' . \\\`-._~~~~~~" + msg "~~~~~~~~~~~,-' \\\`-._~~~~~~" msg "~~~~~~~~~~/ --. >< \\~~~~~" msg "~~~~~~~~~/ (*)> -<: \\~~~~" msg "~~~~~~~~~( ^~-' (*) )~~~~" - msg "~~~~~~~~~\\ . . ^+-_/ |~~~~" - msg "~~~~~~~~~~\\ .' {vvv} |~~~~" - msg "~~~~~~~~~~,\\ ' , {^^^},/~~~~~" + msg "~~~~~~~~~\\ ^+-_/ |~~~~" + msg "~~~~~~~~~~\\ {vvv} |~~~~" + msg "~~~~~~~~~~,\\ , {^^^},/~~~~~" msg "~~~~~~~~,/ \`---.....-'~~W~~~~" msg "~~~~~~,/ \\_____/_\\_W~~/~~~~~" msg "~~~~~/ /~~~\\__/~~~~~~" @@ -1668,8 +1667,8 @@ case "$cmd" in rm -f Xonotic/key_15.d0pk { verbose cd Xonotic/mapping - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701.tar.bz2 - verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110701-win32-7z.exe + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819.tar.bz2 + verbose wget http://www.icculus.org/netradiant/files/netradiant-1.5.0-20110819-win32-7z.exe for X in *-7z.exe; do 7za x "$X" rm -f "$X" @@ -1852,6 +1851,29 @@ case "$cmd" in verbose export del_src=true find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh ;; + release-buildpk3-transform-mapping) + dir=$1 + verbose cd "$dir" + # remove stuff radiant has no use for + verbose find . -name \*_norm.\* -exec rm -f {} \; + verbose find . -name \*_bump.\* -exec rm -f {} \; + verbose find . -name \*_glow.\* -exec rm -f {} \; + verbose find . -name \*_gloss.\* -exec rm -f {} \; + verbose find . -name \*_pants.\* -exec rm -f {} \; + verbose find . -name \*_shirt.\* -exec rm -f {} \; + verbose find . -name \*_reflect.\* -exec rm -f {} \; + verbose find . -not \( -name \*.tga -o -name \*.png -o -name \*.jpg \) -exec rm -f {} \; + # texture: convert to jpeg and dds + # music: reduce bitrate + verbose export do_jpeg=true + verbose export jpeg_qual_rgb=80 + verbose export jpeg_qual_a=97 + verbose export do_dds=false + verbose export do_ogg=true + verbose export ogg_qual=1 + verbose export del_src=true + find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh + ;; release-buildpk3) src=$1 dst=$2 @@ -1887,7 +1909,7 @@ case "$cmd" in versionstr="$versionstr$RELEASETYPE" ;; esac - if [ $gv -lt 900 ]; then + if [ $gv -lt 9900 ]; then # pre-1.0: compatible with any other pre-1.0 verbose sed " s/^set g_xonoticversion [^ ]* /set g_xonoticversion $versionstr /; @@ -1959,7 +1981,7 @@ case "$cmd" in verbose "$SELF" release-buildpk3s data/font-nimbussansl.pk3dir raw '' verbose "$SELF" release-buildpk3s data/font-xolonium.pk3dir raw '' verbose "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '-high' low '-low' normaldds '' - verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '-high' low '-low' normaldds '' + verbose "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '-high' low '-low' normaldds '' mapping '-mapping' verbose "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw '' low '-low' verbose "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir normal '-high' normaldds '' ;; @@ -1986,15 +2008,17 @@ case "$cmd" in rm -f $crypto_libs fi # build the archives + verbose mkzip Xonotic-$stamp-enginesource.zip \ + Xonotic/source/darkplaces/ \ + Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3 + verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-engine.zip verbose mkzip Xonotic-$stamp-engine.zip \ Xonotic/*.dll \ Xonotic/bin32/*.dll \ Xonotic/bin64/*.dll \ Xonotic/*.app \ Xonotic/xonotic-* \ - Xonotic/xonotic.exe \ - Xonotic/source/darkplaces/ \ - Xonotic/COPYING Xonotic/GPL-2 Xonotic/GPL-3 + Xonotic/xonotic.exe verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip verbose mkzip Xonotic-$stamp-common.zip \ Xonotic/source/fteqcc/ \ @@ -2006,6 +2030,11 @@ case "$cmd" in Xonotic/key_0.d0pk \ Xonotic/data/font-nimbussansl-$stamp.pk3 \ Xonotic/data/font-xolonium-$stamp.pk3 + verbose cp Xonotic-$stamp-enginesource.zip Xonotic-$stamp-source.zip + verbose mkzip Xonotic-$stamp-source.zip \ + Xonotic/source/fteqcc/ \ + Xonotic/source/qcsrc/ \ + Xonotic/misc/logos verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip verbose mkzip0 Xonotic-$stamp.zip \ Xonotic/data/xonotic-$stamp-data.pk3 \ @@ -2028,7 +2057,7 @@ case "$cmd" in verbose mkzip Xonotic-$stamp-mappingsupport.zip \ Xonotic/mapping verbose mkzip0 Xonotic-$stamp-mappingsupport.zip \ - Xonotic/data/xonotic-$stamp-maps-low.pk3 + Xonotic/data/xonotic-$stamp-maps-mapping.pk3 ;; release) verbose "$SELF" release-prepare