From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 6 May 2010 15:00:41 +0000 (+0200)
Subject: autobuild fixes
X-Git-Tag: xonotic-v0.1.0preview~473^2~1
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6087e1d7ba9e5160d5ccad806b7f9c824b4a4006

autobuild fixes
---

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 3820aff4..8b6cd4d5 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -232,6 +232,14 @@ for my $m(@{$options->{maps}})
 				}
 			}
 		};
+
+		if(defined $shaderlist_new)
+		{
+			mkdir "$mapdir/scripts";
+			open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
+			print $fh $shaderlist_new;
+			close $fh;
+		}
 	}
 
 	local $SIG{INT} = sub
@@ -243,14 +251,6 @@ for my $m(@{$options->{maps}})
 
 	eval
 	{
-		if(defined $shaderlist_new)
-		{
-			mkdir "$mapdir/scripts";
-			open my $fh, ">", "$mapdir/scripts/shaderlist.txt";
-			print $fh $shaderlist_new;
-			close $fh;
-		}
-
 		unlink <$m/lm_*>; # delete old external lightmaps
 		q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
 			or die "-bsp: $?";
diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 66836365..1e81237a 100755
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -4,6 +4,8 @@ bspdir="$PWD/bspfiles"
 mkdir -p "$bspdir"
 cd data/xonotic-maps.pk3dir
 git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
+	git reset --hard
+	git clean -xfd
 	git checkout "$HASH"
 	for F in maps/*.map.options; do
 		if ! [ -f "$F" ]; then