From e8738e51de414825b24cf82be9286ff6969704a3 Mon Sep 17 00:00:00 2001 From: David Brown Date: Thu, 14 Jul 2016 17:01:20 +0100 Subject: [PATCH] Add termux build to buildall. --- src/tools/make/buildall.pl | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl index 3aeb7d35..160de3b0 100755 --- a/src/tools/make/buildall.pl +++ b/src/tools/make/buildall.pl @@ -7,14 +7,15 @@ use Cwd; my $branch = "master"; my %machines = ( - "pi" => ['pi@pie', "sudo", "make full", "projects/oberon/vishap/voc"], - "darwin" => ['dave@dcb', "sudo", "make full", "projects/oberon/vishap/voc"], - "wind" => ['-p5932 dave@wax', "", "sh makeall.sh", "~"], - "lub32" => ['dave@lub32', "sudo", "make full", "vishap/voc"], - "ob32" => ['root@nas-ob32', "", "make full", "vishap/voc"], - "ce64" => ['-p5922 obe@www', "sudo", "make full", "vishap/voc"], - "ub64" => ['dave@nas-ub64', "sudo", "make full", "vishap/voc"], - "fb64" => ['root@oberon', "", "make full", "vishap/voc"] + "pi" => ['pi@pie', "sudo", "make full", "projects/oberon/vishap/voc"], + "darwin" => ['dave@dcb', "sudo", "make full", "projects/oberon/vishap/voc"], + "wind" => ['-p5932 dave@wax', "", "sh makeall.sh", "~"], + "android" => ['-p8022 root@and', "", "sh makeall.sh", "~"], + "lub32" => ['dave@lub32', "sudo", "make full", "vishap/voc"], + "ob32" => ['root@nas-ob32', "", "make full", "vishap/voc"], + "ce64" => ['-p5922 obe@www', "sudo", "make full", "vishap/voc"], + "ub64" => ['dave@nas-ub64', "sudo", "make full", "vishap/voc"], + "fb64" => ['root@oberon', "", "make full", "vishap/voc"] ); @@ -73,11 +74,12 @@ sub parselog { my $libraryok = ""; my $sourcechange = ""; my $tests = ""; + my $key = ""; open(my $log, $fn) // die "Couldn't open build log $fn."; while (<$log>) { if (/^([0-9\/]+) ([0-9.]+) .+\.log$/) { if ($date ne "") { # Write previous make status - my $key = "$os-$compiler-$datamodel"; + $key = "$os-$compiler-$datamodel"; if ($key ne "") { $status{$key} = [$fn, $date, $time, $os, $compiler, $datamodel, $branch, $compilerok, $libraryok, $sourcechange, $tests]; } @@ -97,7 +99,7 @@ sub parselog { if (/^([0-9.]+) --- Confidence tests passed ---$/) {$tests = "Passed";} } close($log); - my $key = "$os-$compiler-$datamodel"; + $key = "$os-$compiler-$datamodel"; if ($key ne "") { $status{$key} = [$fn, $date, $time, $os, $compiler, $datamodel, $branch, $compilerok, $libraryok, $sourcechange, $tests]; }