aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorLars Persson2006-03-09 15:07:10 +0000
committerLars Persson2006-03-09 15:07:10 +0000
commit512963525722007604f26bbb02b71e7795676f08 (patch)
tree88a91b8d88c425b3ecfb4f8d7ffcbf6b5206d154 /backends
parent6db0289f3032a3df3200210a4a2a173fd9805858 (diff)
downloadscummvm-rg350-512963525722007604f26bbb02b71e7795676f08.tar.gz
scummvm-rg350-512963525722007604f26bbb02b71e7795676f08.tar.bz2
scummvm-rg350-512963525722007604f26bbb02b71e7795676f08.zip
Updated build scripts
svn-id: r21182
Diffstat (limited to 'backends')
-rw-r--r--backends/symbian/AdaptAllMMPs.pl1
-rw-r--r--backends/symbian/BuildPackageUpload_AllVersions.pl15
2 files changed, 10 insertions, 6 deletions
diff --git a/backends/symbian/AdaptAllMMPs.pl b/backends/symbian/AdaptAllMMPs.pl
index 8dbe1cd64c..47c1d2effd 100644
--- a/backends/symbian/AdaptAllMMPs.pl
+++ b/backends/symbian/AdaptAllMMPs.pl
@@ -62,7 +62,6 @@ my @excludes_snd = (
"freeverb.cpp"
);
my @excludes_gui = (
- "ThemeNew",
);
#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])
diff --git a/backends/symbian/BuildPackageUpload_AllVersions.pl b/backends/symbian/BuildPackageUpload_AllVersions.pl
index c6071eff3d..4205822f13 100644
--- a/backends/symbian/BuildPackageUpload_AllVersions.pl
+++ b/backends/symbian/BuildPackageUpload_AllVersions.pl
@@ -215,7 +215,7 @@ if ($count)
print "> $Error\n";
}
print "=======================================================================================\n";
- print "\007\007\007";
+ print "\007\007";
}
# first clean up 'initial path' by removing possible old entries (in case of aborted builds)
@@ -274,7 +274,10 @@ my $header = "
if (-e $TargetFilePath) { unlink($TargetFilePath) or PrintErrorMessage("Removing $TargetFilePath"); }
my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
- PrintMessage("Building $Target ($Redirection)");
+ my $Message = "Building $Target ($Redirection)";
+ PrintMessage($Message) if (!$ReallyQuiet);
+ print(" $Message\n") if ($ReallyQuiet);
+
my $OldSize = (-s $build_log_err);
$Redirection = ($RedirectSTDERR ? "2>> $build_log_err" : "");
system("abld build armi urel $Redirection >> $build_log_out");
@@ -434,13 +437,15 @@ sub BuildVariation()
PrintErrorMessage("'abld clean armi urel' exited with value " . ($? >> 8)) if ($? >> 8);
my $Redirection = "OUT:file, ERR:".($RedirectSTDERR ? "file" : "screen");
- PrintMessage("Building $Package ($Redirection)");
+ my $Message = "Building $Package ($Redirection)";
+ PrintMessage($Message) if (!$ReallyQuiet);
+ print(" $Message\n") if ($ReallyQuiet);
my $OldSize = (-s $build_log_err);
$Redirection = ($RedirectSTDERR ? "2>> $build_log_err" : "");
system("abld build armi urel $Redirection >> $build_log_out");
$OK = 0 if ($? >> 8);
- print " STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err));
+ print " STDERR: ".((-s $build_log_err)-$OldSize)." bytes output written to $build_log_err\n+--------------------------------------------------------------------------------------\n" if ($OldSize != (-s $build_log_err) && !$ReallyQuiet);
PrintErrorMessage("'abld build armi urel' exited with value " . ($? >> 8)) if ($? >> 8);
return 0 if (!$OK); # ABLD always returns ok :( grr
PrintMessage("Done.") if (!$ReallyQuiet);
@@ -594,7 +599,7 @@ sub PrintErrorMessage()
print "+--------------------------------------------------------------------------------------\n";
PrintMessage("ERROR: $CurrentTarget: $msg");
print "\007" if (!$HaltOnError);
- print "\007\007\007" if ($HaltOnError); # make more noise if halt-on-error
+ print "\007\007" if ($HaltOnError); # make more noise if halt-on-error
}
sub PrintMessage()