X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=8599484f386cd7170c74a0d14691ca7d9bc826e5;hp=35b876cacb23b9d7189fb3bc285e637398e4341a;hb=a9da16b1915733874db39823b6dc506f6b41739e;hpb=d96a84b1b32b69ad5369f399e7430a274ffcdf08

diff --git a/all b/all
index 35b876ca..8599484f 100755
--- a/all
+++ b/all
@@ -3,6 +3,10 @@
 
 set -e
 
+# I use this in EVERY shell script ;)
+LF="
+"
+
 d00=`pwd`
 while ! [ -f ./all ]; do
 	if [ x"`pwd`" = x"/" ]; then
@@ -184,7 +188,7 @@ repoflags()
 
 repos=`for d in $repos; do
 	p="${d%dir}"
-	if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! [ -f "$p" ]; then
+	if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
 		echo "$d"
 	fi
 done`
@@ -209,10 +213,6 @@ case "$cmd" in
 					enter "$d0/$d" verbose
 					verbose git config remote.origin.url "$url"
 					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-						# TODO remove this line later
-
-					verbose git config core.autocrlf false
-					verbose git config core.safecrlf false # we don't NEED that...
 
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
@@ -233,29 +233,53 @@ case "$cmd" in
 			else
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
-				verbose git checkout "$branch"
+				if [ "$branch" != "master" ]; then
+					verbose git checkout --track -b "$branch" origin/"$branch"
+				fi
 				cd "$d0"
 			fi
 		done
 		;;
+	update-maps)
+		misc/tools/xonotic-map-compiler-autobuild download
+		;;
 	checkout|switch)
 		remote=$1
 		branch=$2
 		if [ -z "$branch" ]; then
-			branch=$remote
-			remote=origin
+			case "$remote" in
+				origin/*)
+					branch=${remote#origin/}
+					remote=origin
+					;;
+				*)
+					branch=$remote
+					remote=origin
+					;;
+			esac
 		fi
 		exists=false
 		for d in $repos; do
 			enter "$d0/$d" verbose
-			if git rev-parse "refs/heads/$branch" >/dev/null 2>&1; then
+			b=$branch
+			if [ -n "$b" ] && git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout "$branch"
-			elif git rev-parse "refs/remotes/$remote/$branch" >/dev/null 2>&1; then
+				verbose git checkout "$b"
+			elif [ -n "$b" ] && git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
 				exists=true
-				verbose git checkout --track -b "$branch" "$remote/$branch"
+				verbose git checkout --track -b "$b" "$remote/$b"
 			else
-				verbose git checkout "`repobranch "$d"`"
+				b=`repobranch "$d"`
+				if git rev-parse "refs/heads/$b" >/dev/null 2>&1; then
+					exists=true
+					verbose git checkout "$b"
+				elif git rev-parse "refs/remotes/$remote/$b" >/dev/null 2>&1; then
+					exists=true
+					verbose git checkout --track -b "$b" "$remote/$b"
+				else
+					echo "WTF? Not even branch $b doesn't exist in $d"
+					exit 1
+				fi
 			fi
 			cd "$d00"
 			checkself "$cmd" "$@"
@@ -293,11 +317,13 @@ case "$cmd" in
 						if [ -n "$srcbranch" ]; then
 							b=$srcbranch
 						else
-							b="`repobranch "$d"`"
+							b=origin/"`repobranch "$d"`"
+							verbose git fetch origin || true
 						fi
 						# TODO do this without pushing
-						verbose git push "$remote" "$b":"$branch"
-						verbose git checkout --track -b "$branch" "$remote/$branch"
+						verbose git checkout -b "$branch" "$b"
+						verbose git config "branch.$branch.remote" "$remote"
+						verbose git config "branch.$branch.merge" "refs/heads/$branch"
 					fi
 				fi
 				cd "$d0"
@@ -306,35 +332,6 @@ case "$cmd" in
 		fi
 		;;
 	branches)
-		for d in $repos; do
-			enter "$d0/$d"
-			echo "In $d:"
-			git branch -a -v -v | cut -c 3- | while read -r BRANCH REV UPSTREAM TEXT; do
-				case "$UPSTREAM" in
-					\[*)
-						UPSTREAM=${UPSTREAM#\[}
-						UPSTREAM=${UPSTREAM%\]}
-						UPSTREAM=${UPSTREAM%:*}
-						;;
-					*)
-						TEXT="$UPSTREAM $TEXT"
-						UPSTREAM=
-						;;
-				esac
-				if [ x"$REV" = x"->" ]; then
-					continue
-				fi
-				BRANCH=${BRANCH#remotes/}
-				echo -n "  $BRANCH"
-				if [ -n "$UPSTREAM" ]; then
-					echo -n " (tracking $UPSTREAM)"
-				fi
-				#echo " $TEXT"
-				echo
-			done
-		done
-		;;
-	branches_short)
 		for d in $repos; do
 			cd "$d0/$d" # am in a pipe, shouldn't use enter
 			git branch -a -v -v | cut -c 3- | sed "s,^,$d ,"
@@ -343,6 +340,9 @@ case "$cmd" in
 			branches_list=
 			# branches_repos_*=
 			while read -r d BRANCH REV UPSTREAM TEXT; do
+				if [ x"$BRANCH" = x"`repobranch "$d"`" ]; then
+					continue
+				fi
 				case "$UPSTREAM" in
 					\[*)
 						UPSTREAM=${UPSTREAM#\[}
@@ -361,13 +361,21 @@ case "$cmd" in
 				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
 				branches_list="$branches_list $BRANCH" # TEH SORT MAKEZ IT UNIEQ
 				eval "r=\$branches_repos_$ID"
-				r="$r $d:$UPSTREAM"
+				case "$UPSTREAM" in
+					'')
+						r="$r $d"
+						;;
+					*)
+						r="$r $d:$UPSTREAM"
+						;;
+				esac
 				eval "branches_repos_$ID=\$r"
 			done
 			echo -n "$branches_list" | xargs -n 1 echo | sort -u | while IFS= read -r BRANCH; do
 				ID=`echo "$BRANCH" | tr -c "A-Za-z0-9." "_"`
 				eval "r=\$branches_repos_$ID"
-				echo "$BRANCH: $r"
+				printf "%-60s %s\n" "$BRANCH" "$r"
+				#echo "$BRANCH: $r"
 			done
 		}
 		;;
@@ -403,7 +411,12 @@ case "$cmd" in
 				fi
 			fi
 			rem=`git config "branch.$r.remote" || echo origin`
-			if { git log "$rem/$r".."$r" || git log origin/"`repobranch "$d"`".."$r"; } | grep .; then
+			bra=`git config "branch.$r.merge" || echo "$r"`
+			upstream="$rem/$bra"
+			if ! [ git rev-parse "$upstream" ]; then
+				upstream="`repobranch "$d"`"
+			fi
+			if git log "$upstream".."$r" | grep .; then
 				if yesno "Push \"$r\" in $dv?"; then
 					verbose git push "$rem" HEAD
 				fi
@@ -411,7 +424,7 @@ case "$cmd" in
 			if [ x"$submit" = x"-s" ]; then
 				case "$r" in
 					*/*)
-						verbose git push "$rem" HEAD:"${r%%/*}/finished/${r#*/}"
+						verbose git push "$rem" HEAD:"${bra%%/*}/finished/${bra#*/}"
 						;;
 				esac
 			fi
@@ -421,6 +434,12 @@ case "$cmd" in
 	compile)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			TARGETS="sv-debug cl-debug"
+			if [ -z "$CC" ]; then
+				export CC=gcc
+			fi
+		elif [ x"`uname`" = x"Darwin" ] && ( [ -d /Library/Frameworks/SDL.framework ] || [ -d $(HOME)/Library/Frameworks/SDL.framework ] ); then
+			# AGL is broken in Snow Leopard, so let's default to SDL if it is available.
+			TARGETS="sv-debug sdl-debug"
 		else
 			TARGETS="sv-debug cl-debug sdl-debug"
 		fi
@@ -481,13 +500,17 @@ case "$cmd" in
 		for T in $TARGETS; do
 			verbose make $MAKEFLAGS "$@" "$T"
 		done
+		verbose "$SELF" update-maps
+		;;
+	makebuild)
+		
 		;;
 	run)
 		if [ -n "$WE_HATE_OUR_USERS" ]; then
 			client=
 			export PATH="$d0/misc/buildfiles/w32:$PATH"
 		elif [ x"`uname`" = x"Darwin" ]; then
-			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Nexuiz.app/Contents/MacOS"
+			export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
 			client=-sdl
 		else
 			client=-sdl
@@ -513,9 +536,11 @@ case "$cmd" in
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic "$@"
 
 		# if pulseaudio is running: USE IT
-		if ps -C pulseaudio >/dev/null; then
-			if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
-				export SDL_AUDIODRIVER=pulse
+		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
+			if ps -C pulseaudio >/dev/null; then
+				if ldd /usr/lib/libSDL.so 2>/dev/null | grep pulse >/dev/null; then
+					export SDL_AUDIODRIVER=pulse
+				fi
 			fi
 		fi
 
@@ -525,9 +550,18 @@ case "$cmd" in
 		"$@"
 		;;
 	each|foreach)
+		keep_going=false
+		if [ x"$1" = x"-k" ]; then
+			keep_going=true
+			shift
+		fi
 		for d in $repos; do
 			if verbose cd "$d0/$d"; then
-				verbose "$@"
+				if $keep_going; then
+					verbose "$@" || true
+				else
+					verbose "$@"
+				fi
 				cd "$d0"
 			fi
 		done
@@ -618,55 +652,245 @@ case "$cmd" in
 		;;
 	admin-merge-2)
 		t=`mktemp`
+		report=""
+		reportecho()
+		{
+			report=$report"$*$LF"
+			echo "$*"
+		}
+		reportecho4()
+		{
+			report=$report"    $*$LF"
+			echo "    $*"
+		}
+		reportdo4()
+		{
+			o=`"$@" | sed 's/^/    /' || true`
+			reportecho "$o"
+		}
 		for d in $repos; do
 			enter "$d0/$d" verbose
+			base="`repobranch "$d"`"
+			reportecho "In $d:"
 			for ref in `git for-each-ref --format='%(refname)' refs/remotes/origin/`; do
 				case "${ref#refs/remotes/origin/}" in
-					"`repobranch "$d"`")
+					"$base")
 						continue
 						;;
 					HEAD|master)
 						continue
 						;;
 				esac
-				echo "$ref"
-				if git notes --ref "refs/notes/admin-merge" show "$ref" 2>/dev/null; then
-					echo "Not merging, already had this one"
-				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ git log HEAD.."$ref"; git diff HEAD..."$ref"; } | less'; then
-					git checkout master
+				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"`
+				diffdata=`git diff --color --find-copies-harder --ignore-space-change "$base"..."$ref"`
+				if [ -z "$logdata" ]; then
+					reportecho4 "--> not merging, no changes vs master"
+				elif [ -z "$diffdata" ]; then
+					reportecho4 "--> not merging, no changes vs master, branch contains redundant history"
+					if yesno "Branch \"$ref\" probably should get deleted. Do it?" '{ echo "$logdata"; } | less -r'; then
+						git push origin :"${ref#refs/remotes/origin/}"
+						reportecho4 "--> branch deleted"
+					fi
+				elif [ -n "$note" ]; then
+					reportdo4 echo "$note"
+					reportecho4 "--> not merging, already had this one rejected before"
+				elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
+					git checkout "$base"
 					org=`git rev-parse HEAD`
 					if ! git merge "$ref" 2>&1 | tee "$t"; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add -m "Merge failed:
-`cat "$t"`" "$ref"
+						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
+						reportdo4 cat "$t"
+						reportecho4 "--> merge failed"
 					elif ! "$SELF" compile 2>&1 | tee "$t"; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add -m "Compile failed:
-`cat "$t"`" "$ref"
+						GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Compile failed:$LF`cat "$t"`" "$ref"
+						reportdo4 cat "$t"
+						reportecho4 "--> compile failed"
 					elif ! yesno "Still merge \"$ref\" into `git symbolic-ref HEAD` of $d? Maybe you want to test first."; then
 						git reset --hard "$org"
-						git notes --ref "refs/notes/admin-merge" add "$ref"
+						git notes edit "$ref"
+						note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+						reportdo4 echo "$note"
+						reportecho4 "--> test failed"
 					else
 						case ",`repoflags "$d"`," in
 							*,svn,*)
-								git pull
-								git rebase -i "$org"
+								# we do quite a mess here... luckily we know $org
+								git pull # svn needs to be current
+								git rebase -i --onto master "$org"
 								git svn dcommit --add-author-from
+								git reset --hard "$org"
 								;;
 							*)
 								git push origin HEAD
 								;;
 						esac
+						reportecho4 "--> MERGED"
 						if yesno "Delete original branch \"$ref\"?"; then
 							git push origin :"${ref#refs/remotes/origin/}"
+							reportecho4 "--> branch deleted"
 						fi
 					fi
 				else
-					git notes --ref "refs/notes/admin-merge" add "$ref"
+					GIT_NOTES_REF=refs/notes/admin-merge git notes edit "$ref"
+					note=`GIT_NOTES_REF=refs/notes/admin-merge git notes show "$ref" 2>/dev/null || true`
+					if [ -n "$note" ]; then
+						reportdo4 echo "$note"
+						reportecho4 "--> rejected"
+					else
+						reportecho4 "--> postponed"
+					fi
 				fi
+				reportecho ""
 			done
+			reportecho ""
 		done
 		rm -f "$t"
+		echo "$report" | ssh nexuiz@rm.endoftheinternet.org cat '>>' public_html/xonotic-merge-notes.txt
+		;;
+
+	# release building goes here
+	release-mkdir)
+		mkdir -p Xonotic/"$1"
+		;;
+	release-prepare)
+#"$SELF" each git clean -fxd
+		mkdir -p Xonotic
+		"$SELF" release-copy Docs/
+		"$SELF" release-copy misc/
+		"$SELF" release-copy server/
+		"$SELF" release-copy xonotic-linux-glx.sh
+		"$SELF" release-copy xonotic-linux-sdl.sh
+		"$SELF" release-mkdir data
+		"$SELF" release-mkdir fteqcc
+		;;
+	release-copy)
+		rsync --exclude=.git -vaSHPAX "$1" Xonotic/"$1"
+		;;
+	release-compile-run)
+		host=$1
+		buildpath=$2
+		maketargets=$3
+		makeflags=$4
+		srcdir=$5
+		targetfiles=$6
+		rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
+		ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+        for f in $targetfiles; do
+			rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+		done
+		;;
+	release-compile)
+		suffix=$1
+		makeflags=$2
+		fteqcc_maketargets=$3
+		fteqcc_files=$4
+		darkplaces_maketargets=$5
+		darkplaces_files=$6
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
+		;;
+	release-engine-win32)
+		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/w32/* Xonotic/
+		"$SELF" release-compile win32 \
+			'"DP_MAKE_TARGET=mingw CC="$HOME/mingw32/bin/i386-mingw32-gcc -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dxheaders" WINDRES="$HOME/mingw32/bin/i386-mingw32-windres" SDL_CONFIG="$HOME/sdl-win32/SDL-1.2.13/bin/sdl-config"' \
+			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc.exe' \
+			debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
+		;;
+	release-engine-osx)
+		rsync --exclude=.git -vaSHPAX Xonotic/misc/buildfiles/osx/* Xonotic/
+		"$SELF" release-compile osx \
+			'CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"' \
+			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
+			sdl-debug 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin'
+		;;
+	release-engine-linux32)
+		"$SELF" release-compile linux32 \
+			'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-i386/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \
+			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
+			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux32-dedicated'
+		;;
+	release-engine-linux64)
+		"$SELF" release-compile linux64 \
+			'CC="gcc -g -Wl,--hash-style=sysv" DP_MODPLUG_STATIC_LIBDIR=$HOME/modplug-x86_64/lib DP_LINK_TO_LIBJPEG=1 LDFLAGS_LIBJPEG="$HOME/jpeg7/lib/libjpeg.a" CFLAGS_LIBJPEG="-I$HOME/jpeg7/include"' \
+			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
+			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux-linux64-dedicated'
+		;;
+	release-engine)
+		"$SELF" release-engine-win32
+		"$SELF" release-engine-osx
+		"$SELF" release-engine-linux32
+		"$SELF" release-engine-linux64
+		;;
+	release-maps)
+		"$SELF" update-maps
+		for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
+			if [ -f "$X" ]; then
+				cd Xonotic/data/xonotic-maps.pk3dir
+				unzip ../../../"$X"
+				cd ../../..
+			fi
+		done
+		;;
+	release-finish)
+		# version numnber and stuff like that
+		;;
+	release-buildpk3-transform-raw)
+		;;
+	release-buildpk3-transform-normal)
+		# texture: convert to jpeg
+		;;
+	release-buildpk3-transform-low)
+		# texture: convert to jpeg and downscale
+		# music: reduce bitrate
+		;;
+	release-buildpk3)
+		src=$1
+		dst=$2
+		transform=$3
+		case "$dst" in
+			/*)
+				;;
+			*/)
+				dst="$PWD/$dst"
+				;;
+		esac
+		rm -rf Xonotic/temp
+		rsync --exclude=.git -vaSHPAX "$src"/ "Xonotic/temp"
+		"$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
+		7za a -tzip -mx=9 "$dst" .
+		rm -rf Xonotic/temp
+		;;
+	release-buildpk3s)
+		src=$1
+		shift
+		while [ "$#" -gt 1 ]; do
+			"$SELF" release-buildpk3 "$src" "Xonotic/${src%.pk3dir}$2.pk3" "$1"
+		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 ''
+		;;
+	release)
+		"$SELF" release-prepare
+		"$SELF" release-engine
+		"$SELF" release-gamedata
+		"$SELF" release-maps
+		"$SELF" release-finish
+		"$SELF" release-pack
 		;;
 	*)
 		echo "Usage:"