From: David Knapp <mazecraze96@gmail.com>
Date: Sun, 1 Dec 2019 22:03:42 +0000 (-0500)
Subject: Preliminary support for the build.sh script; run and compile work
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fhpbuild;p=xonotic%2Fxonotic.git

Preliminary support for the build.sh script; run and compile work
---

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index 03499ba9..3068a918 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -4,10 +4,10 @@ gitsite_url="http://gitlab.com/groups/xonotic/"
 allrepos()
 {
 	"$@" .                             xonotic.git                  master         ""
-	"$@" data/xonotic-data.pk3dir      xonotic-data.pk3dir.git      master         ""
+	"$@" data/xonotic-data.pk3dir      xonotic-data.pk3dir.git      hpbuild         ""
 	"$@" data/xonotic-music.pk3dir     xonotic-music.pk3dir.git     master         ""
 	"$@" data/xonotic-nexcompat.pk3dir xonotic-nexcompat.pk3dir.git master         "no"
-	"$@" darkplaces                    darkplaces.git               div0-stable    "svn"
+	"$@" darkplaces                    darkplaces.git               horsepower    "svn"
 	"$@" netradiant                    netradiant.git               master         ""
 	"$@" div0-gittools                 div0-gittools.git            master         "no"
 	"$@" d0_blind_id                   d0_blind_id.git              master         ""
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 0938974c..1a994e4f 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -289,18 +289,20 @@ case "$cmd" in
 		# 4 levels up: data, xonotic-data, qcsrc, server
 
 		verbose cd "$d0/darkplaces"
-		if [ x"$BAD_TARGETS" = x" " ]; then
-			$ECHO "Warning: invalid empty client, default clients will be used."
-		fi
-		if $cleandp; then
-			verbose $MAKE $MAKEFLAGS clean
-		fi
-		for T in $TARGETS; do
-			verbose $MAKE $MAKEFLAGS STRIP=: "$@" "$T"
-		done
-		for T in $BAD_TARGETS; do
-			$ECHO "Warning: discarded invalid client $T."
-		done
+		#if [ x"$BAD_TARGETS" = x" " ]; then
+		#	$ECHO "Warning: invalid empty client, default clients will be used."
+		#fi
+		#if $cleandp; then
+		#	verbose $MAKE $MAKEFLAGS clean
+		#fi
+		#for T in $TARGETS; do
+		#	verbose $MAKE $MAKEFLAGS STRIP=: "$@" "$T"
+		#done
+		#for T in $BAD_TARGETS; do
+		#	$ECHO "Warning: discarded invalid client $T."
+		#done
+
+		verbose ./build.sh --nocache --auto --j8 --config-dir="$d0/data/xonotic-data.pk3dir" --build-dir="$d0/darkplaces" xonotic
 
 		verbose "$SELF" update-maps
 		;;
@@ -321,10 +323,10 @@ case "$cmd" in
 			export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
 		fi
 
-		client=-sdl
+		client=""
 		USE_RLWRAP=no
 		case "$1" in
-			dedicated)
+			sv)
 				client=-$1
 				USE_RLWRAP=
 				shift
@@ -338,15 +340,15 @@ case "$cmd" in
 				;;
 		esac
 
-		if ! [ -x "darkplaces/darkplaces$client" ]; then
-			if [ -x "darkplaces/darkplaces$client.exe" ]; then
+		if ! [ -x "darkplaces/xonotic$client" ]; then
+			if [ -x "darkplaces/xonotic$client.exe" ]; then
 				client=$client.exe
 			else
-				$ECHO "Client darkplaces/darkplaces$client not found, aborting"
+				$ECHO "Client darkplaces/xonotic$client not found, aborting"
 				exit 1
 			fi
 		fi
-		set -- "darkplaces/darkplaces$client" -xonotic "$@"
+		set -- "darkplaces/xonotic$client" -xonotic "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then