From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 23 Jun 2013 16:20:53 +0000 (+0200)
Subject: simplify and fix xonotic-map-compiler for xonotic use
X-Git-Tag: xonotic-v0.8.0~103^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92d375abed4fa0c5476323543647130ef47e69ca;p=xonotic%2Fxonotic.git

simplify and fix xonotic-map-compiler for xonotic use
---

diff --git a/misc/tools/xonotic-map-compiler b/misc/tools/xonotic-map-compiler
index 780ea354..7834af0d 100755
--- a/misc/tools/xonotic-map-compiler
+++ b/misc/tools/xonotic-map-compiler
@@ -106,10 +106,6 @@ while(@ARGV)
 	{
 		$options->{minimap} = undef;
 	}
-	elsif($_ eq '-noshaderlist')
-	{
-		$options->{noshaderlist} = 1;
-	}
 	elsif($_ eq '-bsp_timeout')
 	{
 		$options->{bsp_timeout} = shift @ARGV;
@@ -222,105 +218,86 @@ sub q3map2(@)
 	}
 }
 
-(my $mapdir = getcwd()) =~ s!/[^/]*(?:$)!!;
-$mapdir = "/" if $mapdir eq "";
-symlink "$mapdir", "$linkdir/data";
-
 my ($prescale, $postscale) = ($options->{scalefactor} =~ /^([0-9.]+)(?::([0-9.]+))?$/);
 $prescale = 1 if not defined $prescale;
 $postscale = 1 if not defined $postscale;
 
+my $origcwd = getcwd();
 for my $m(@{$options->{maps}})
 {
-	$m =~ s/\.(?:map|bsp)$//;
-
-	if($prescale != 1)
+	chdir $origcwd
+		or die "chdir $origcwd: $!";
+	if($m =~ s!(.*)/!!)
 	{
-		unshift @{$options->{bsp}}, "-keeplights";
+		my $predir = $1;
+		chdir $predir
+			or die "chdir $predir: $!";
 	}
+	symlink getcwd() . "/..", "$linkdir/data"
+		or die "symlink $linkdir/data: $!";
 
-	my %shaders = map { m!/([^/.]*)\.shader(?:$)! ? ($1 => 1) : () } glob "$mapdir/scripts/*.shader";
+	$m =~ s/\.(?:map|bsp)$//;
 
-	my $restore_shaderlist = sub { };
-	if(!$options->{noshaderlist})
+	if($prescale != 1)
 	{
-		local $ENV{mapdir} = $mapdir;
-		system 'cd $mapdir; make -C ../scripts shaderlist.txt';
-
-		$restore_shaderlist = sub
-		{
-			local $ENV{mapdir} = $mapdir;
-			system 'cd $mapdir; git checkout ../scripts/shaderlist.txt';
-		};
+		unshift @{$options->{bsp}}, "-keeplights";
 	}
 
 	local $SIG{INT} = sub
 	{
 		print "SIGINT caught, cleaning up...\n";
-		$restore_shaderlist->();
 		exit 0;
 	};
 
-	eval
+	unlink <$m/lm_*>; # delete old external lightmaps
+	q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
+		or die "-bsp: $?";
+	if($prescale != 1)
 	{
-		unlink <$m/lm_*>; # delete old external lightmaps
-		q3map2 '-bsp', @{$options->{bsp}},   "$m.map"
-			or die "-bsp: $?";
-		if($prescale != 1)
-		{
-			q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
-				or die "-scale: $?";
-			rename "${m}_s.bsp", "$m.bsp"
-				or die "rename ${m}_s.bsp $m.bsp: $!";
-		}
-		my @o = @{$options->{order}};
-		push @o, qw/light vis/;
-		my %o = ();
+		q3map2 '-scale', @{$options->{scale}}, $prescale, "$m.bsp"
+			or die "-scale: $?";
+		rename "${m}_s.bsp", "$m.bsp"
+			or die "rename ${m}_s.bsp $m.bsp: $!";
+	}
+	my @o = @{$options->{order}};
+	push @o, qw/light vis/;
+	my %o = ();
 
-		for(@o)
+	for(@o)
+	{
+		next if $o{$_}++;
+		if($_ eq 'light')
 		{
-			next if $o{$_}++;
-			if($_ eq 'light')
-			{
-				if(defined $options->{light})
-				{
-					q3map2 '-light',        @{$options->{light}}, "$m.map"
-						or die "-light: $?";
-				}
-			}
-			if($_ eq 'vis')
+			if(defined $options->{light})
 			{
-				if(defined $options->{vis})
-				{
-					q3map2 '-vis',          @{$options->{vis}},   "$m.map"
-						or die "-vis: $?";
-				}
+				q3map2 '-light',        @{$options->{light}}, "$m.map"
+					or die "-light: $?";
 			}
 		}
-
-		if($postscale != 1)
-		{
-			q3map2 '-scale', @{$options->{scale}}, $postscale, "$m.bsp"
-				or die "-scale: $?";
-			rename "${m}_s.bsp", "$m.bsp"
-				or die "rename ${m}_s.bsp $m.bsp: $!";
-		}
-
-		if(defined $options->{minimap})
+		if($_ eq 'vis')
 		{
-			q3map2 '-minimap',      @{$options->{minimap}}, "$m.map"
-				or die "-minimap: $?";
+			if(defined $options->{vis})
+			{
+				q3map2 '-vis',          @{$options->{vis}},   "$m.map"
+					or die "-vis: $?";
+			}
 		}
+	}
 
-		unlink "$m.srf";
-		unlink "$m.prt";
-
-		$restore_shaderlist->();
-		1;
+	if($postscale != 1)
+	{
+		q3map2 '-scale', @{$options->{scale}}, $postscale, "$m.bsp"
+			or die "-scale: $?";
+		rename "${m}_s.bsp", "$m.bsp"
+			or die "rename ${m}_s.bsp $m.bsp: $!";
 	}
-	or do
+
+	if(defined $options->{minimap})
 	{
-		$restore_shaderlist->();
-		die $@;
-	};
+		q3map2 '-minimap',      @{$options->{minimap}}, "$m.map"
+			or die "-minimap: $?";
+	}
+
+	unlink "$m.srf";
+	unlink "$m.prt";
 }