echo "\e[1m$*\e[m"
}
-checksum()
-{
- if [ -x /usr/bin/md5sum ]; then
- /usr/bin/md5sum "$@"
- elif [ -x /bin/md5sum ]; then
- /bin/md5sum "$@"
- elif [ -x /usr/bin/cksum ]; then
- /usr/bin/cksum "$@"
- else
- echo "NOCHECKSUM"
- fi
-}
-
-self=`checksum "$SELF"`
+self=`git hash-object "$SELF"`
checkself()
{
- self_new=`checksum "$SELF"`
+ self_new=`git hash-object "$SELF"`
if [ x"$self" != x"$self_new" ]; then
msg "./all has changed."
if [ -z "$XONOTIC_FORBID_RERUN_ALL" ]; then
enter "$d0/$d" verbose
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
- if git diff HEAD | grep .; then
+ diffdata=`git diff --color HEAD`
+ if [ -n "$diffdata" ]; then
# we have uncommitted changes
- if yesno "Uncommitted changes in \"$r\" in $dv. Commit?"; then
+ if yesno "Uncommitted changes in \"$r\" in $dv. Commit?" 'echo "$diffdata" | less -r'; then
verbose git commit -a
fi
fi
rem=`git config "branch.$r.remote" || echo origin`
bra=`git config "branch.$r.merge" || echo "$r"`
upstream="$rem/$bra"
- if ! [ git rev-parse "$upstream" ]; then
- upstream="`repobranch "$d"`"
+ if ! git rev-parse "$upstream" >/dev/null 2>&1; then
+ upstream="origin/`repobranch "$d"`"
fi
- if git log "$upstream".."$r" | grep .; then
- if yesno "Push \"$r\" in $dv?"; then
+ logdata=`git log --color "$upstream".."$r"`
+ if [ -n "$logdata" ]; then
+ if yesno "Push \"$r\" in $dv?" 'echo "$logdata" | less -r'; then
verbose git push "$rem" HEAD
fi
fi
rm -rf "$patchdir"
;;
admin-merge)
- if [ "$#" = 1 ]; then
- set -- "${1%%/*}" "${1#*/}"
- fi
- for d in $repos; do
- enter "$d0/$d" verbose
- git rev-parse "$1/$2" || continue
- # 1. review
- {
- git log HEAD.."$1/$2"
- git diff HEAD..."$1/$2"
- } | less
- if yesno "Merge \"$1/$2\" into `git symbolic-ref HEAD` of $d?"; then
- git merge "$1/$2"
- if "$SELF" compile && yesno "Still merge \"$1/$2\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
- git push origin HEAD
- git push "$1" :"$2"
- else
- git reset --hard HEAD@{1}
- fi
- fi
- done
- ;;
- admin-merge-2)
+ branch=$1
t=`mktemp`
report=""
reportecho()
continue
;;
esac
+ if [ -n "$branch" ]; then
+ if [ x"$branch" != x"${ref#refs/remotes/origin/}" ]; then
+ continue
+ fi
+ fi
reportecho " Branch $ref:"
note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
logdata=`git log --color "$base".."$ref"`
# version numnber and stuff like that
;;
release-buildpk3-transform-raw)
+ dir=$1
;;
release-buildpk3-transform-normal)
- # texture: convert to jpeg
+ dir=$1
+ cd "$dir"
+ # texture: convert to jpeg and dds
+ export do_jpeg=true
+ export jpeg_qual_rgb=95
+ export jpeg_qual_a=99
+ export do_dds=true
+ export dds_flags=
+ export do_ogg=false
+ find textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-buildpk3-transform-low)
- # texture: convert to jpeg and downscale
+ dir=$1
+ cd "$dir"
+ # texture: convert to jpeg and dds
# music: reduce bitrate
+ export do_jpeg=true
+ export jpeg_qual_rgb=95
+ export jpeg_qual_a=99
+ export do_dds=false
+ export do_ogg=true
+ export ogg_qual=1
+ find textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
;;
release-buildpk3)
src=$1
rm -rf Xonotic/temp
rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
- 7za a -tzip -mx=9 "$dst" .
+ cd Xonotic/temp
+ zip -9r "../../$dst" . ########### 7za a -tzip -mx=9 "../../$dst" .
+ cd ../..
rm -rf Xonotic/temp
;;
release-buildpk3s)
shift
while [ "$#" -gt 1 ]; do
"$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
+ shift
+ shift
done
- rm -rf "$src"
;;
release-pack)
-#"$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
-#"$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
-#"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
- "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
- "$SELF" release-buildpk3s data/xonotic-data.pk3dir raw ''
- "$SELF" release-buildpk3s data/xonotic-maps.pk3dir raw ''
- "$SELF" release-buildpk3s data/xonotic-music.pk3dir raw ''
- "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir raw ''
+ "$SELF" release-buildpk3s data/font-dejavu.pk3dir raw ''
+ "$SELF" release-buildpk3s data/xonotic-data.pk3dir normal '' raw '-raw' low '-low'
+ "$SELF" release-buildpk3s data/xonotic-maps.pk3dir normal '' raw '-raw' low '-low'
+ "$SELF" release-buildpk3s data/xonotic-music.pk3dir normal '' raw '-raw' low '-low'
+ "$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir low ''
;;
release)
"$SELF" release-prepare
- "$SELF" release-engine
- "$SELF" release-gamedata
"$SELF" release-maps
"$SELF" release-finish
"$SELF" release-pack
+ "$SELF" release-engine
;;
*)
echo "Usage:"
projects / xonotic / xonotic.git / blobdiff