X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=29e8a65c0aff1273347f5ec05fa864ae1e11b5ad;hp=5d38877d75f0f98390a6206f80bf65ed0bb919d5;hb=287edd65424ebda4ce78b3089ef843ea8f7fd95e;hpb=cf445ff6ef457d68aa13bb060cf8683bbe221a45

diff --git a/all b/all
index 5d38877d..29e8a65c 100755
--- a/all
+++ b/all
@@ -113,11 +113,11 @@ repos_urls="
 data/xonotic-data.pk3dir      |                                                   | master      |
 data/xonotic-maps.pk3dir      |                                                   | master      |
 data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      |
-mediasource                   |                                                   | master      |
+data/xonotic-nexcompat.pk3dir |                                                   | master      | no
+mediasource                   |                                                   | master      | no
 darkplaces                    |                                                   | div0-stable | svn
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
-div0-gittools                 |                                                   | master      |
+div0-gittools                 |                                                   | master      | no
 netradiant                    |                                                   | master      |
 "
 # todo: in darkplaces, change repobranch to div0-stable
@@ -171,12 +171,47 @@ repoflags()
 	echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
 }
 
-repos=`for d in $repos; do
-	p="${d%dir}"
-	if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
+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"
+			continue
+		fi
+		# if .yes file exists, always keep it
+		if [ -f "$d.yes" ]; then
+			msg "Repository $d enabled by a .yes file"
+			echo "$d"
+			continue
+		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"
+			continue
+		fi
+		# if we have matching pk3, skip
+		if [ x"$p" != x"$d" ] && [ -f "$p" ]; then
+			msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable"
+			continue
+		fi
+		# if "no" flag is set, skip
+		case ",$f," in
+			*,no,*)
+				msg "Repository $d disabled by default, create $d.yes to enable"
+				continue
+				;;
+		esac
+		# default: enable
+		msg "Repository $d enabled by default"
 		echo "$d"
-	fi
-done`
+	done
+}
+
+repos=`listrepos`
 
 if [ "$#" = 0 ]; then
 	set -- help
@@ -229,6 +264,14 @@ fix_upstream_rebase_mergefail()
 	fix_upstream_rebase
 }
 
+fix_git_config()
+{
+	verbose git config core.autocrlf input
+	if [ -z "`git config push.default`" ]; then
+		verbose git config push.default current # or is tracking better?
+	fi
+}
+
 case "$cmd" in
 	fix_upstream_rebase)
 		for d in $repos; do
@@ -247,11 +290,9 @@ case "$cmd" in
 			if [ -d "$d0/$d" ]; then
 				if $allow_pull; then
 					enter "$d0/$d" verbose
+					fix_git_config
 					verbose git config remote.origin.url "$url"
 					verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-
-					verbose git config core.autocrlf input
-
 					r=`git symbolic-ref HEAD`
 					r=${r#refs/heads/}
 					if git config branch.$r.remote >/dev/null 2>&1; then
@@ -274,6 +315,7 @@ case "$cmd" in
 			else
 				verbose git clone "$url" "$d0/$d"
 				enter "$d0/$d" verbose
+				fix_git_config
 				if [ "$branch" != "master" ]; then
 					verbose git checkout --track -b "$branch" origin/"$branch"
 				fi
@@ -506,16 +548,10 @@ case "$cmd" in
 				cleanqc=true
 				shift
 				;;
-			-n)
-				cleandp=false
-				cleanqcc=false
-				cleanqc=false
-				shift
-				;;
 			*)
 				cleandp=false
 				cleanqcc=false
-				cleanqc=true # version info
+				cleanqc=false
 				;;
 		esac
 		if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -620,6 +656,8 @@ case "$cmd" in
 			fi
 		fi
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
+		# change this to:
+		#set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -862,9 +900,10 @@ case "$cmd" in
 			force=true
 		fi
 		for d in $repos; do
-			enter "$d0/$d" verbose
+			verbose cd "$d0/$d"
 			if $force; then
-				verbose git checkout-index -fa
+				verbose git reset --hard
+				#redundant# verbose git checkout-index -fa
 			fi
 			case "$d" in
 				.)
@@ -894,7 +933,11 @@ case "$cmd" in
 		esac
 		verbose rm -rf Xonotic Xonotic*.zip
 		verbose mkdir -p Xonotic
-		verbose date +%Y%m%d > Xonotic/stamp.txt
+		if [ -n "$RELEASEDATE" ]; then
+			verbose echo "$RELEASEDATE" > Xonotic/stamp.txt
+		else
+			verbose date +%Y%m%d > Xonotic/stamp.txt
+		fi
 		verbose git archive --format=tar HEAD -- Docs misc server xonotic-linux-glx.sh xonotic-linux-sdl.sh misc/buildfiles | {
 			verbose cd Xonotic
 			verbose mkdir data fteqcc source source/darkplaces source/fteqcc
@@ -953,7 +996,21 @@ case "$cmd" in
 			esac
 			# now rebrand the binaries...
 			for f in $targetfiles; do
-				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				case "$f" in
+					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
 		fi
 		;;
@@ -992,7 +1049,7 @@ case "$cmd" in
 		verbose "$SELF" release-compile osx \
 			'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
 			'' '' \
-			'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+			'cl-release' 'darkplaces-agl:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
 		;;
 	release-engine-osx)
 		verbose "$SELF" release-engine-osx-sv-sdl
@@ -1120,6 +1177,7 @@ case "$cmd" in
 				fi
 			done
 		fi
+		verbose export git_src_repo="$d0/$src" # skip hash-object
 		verbose "$SELF" release-buildpk3-transform-$transform "Xonotic/temp"
 		verbose zip -9yr "../../$dst" .
 		verbose cd ../..
@@ -1163,16 +1221,19 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		verbose zip -9yr Xonotic-$stamp-common.zip \
+		verbose zip -9yr Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
+			Xonotic/bin64/*.dll \
+			Xonotic/*.app \
+			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe
+		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+		verbose zip -9yr Xonotic-$stamp-common.zip \
 			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
-			Xonotic/*.app \
-			Xonotic/xonotic-* \
-			Xonotic/xonotic.exe \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip
 		verbose zip -0yr Xonotic-$stamp.zip \