autobuild fixes

This commit is contained in:
Rudolf Polzer 2010-05-06 17:00:41 +02:00
parent ce515788e5
commit 6087e1d7ba
2 changed files with 10 additions and 8 deletions

View File

@ -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 local $SIG{INT} = sub
@ -243,14 +251,6 @@ for my $m(@{$options->{maps}})
eval 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 unlink <$m/lm_*>; # delete old external lightmaps
q3map2 '-bsp', @{$options->{bsp}}, "$m.map" q3map2 '-bsp', @{$options->{bsp}}, "$m.map"
or die "-bsp: $?"; or die "-bsp: $?";

View File

@ -4,6 +4,8 @@ bspdir="$PWD/bspfiles"
mkdir -p "$bspdir" mkdir -p "$bspdir"
cd data/xonotic-maps.pk3dir cd data/xonotic-maps.pk3dir
git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do git for-each-ref 'refs/remotes' | while read -r HASH TYPE REFNAME; do
git reset --hard
git clean -xfd
git checkout "$HASH" git checkout "$HASH"
for F in maps/*.map.options; do for F in maps/*.map.options; do
if ! [ -f "$F" ]; then if ! [ -f "$F" ]; then