diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-10-12 09:21:38 +0100 |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-10-12 09:21:38 +0100 |
| commit | 913033644906af08b56c4241b05ce4b474bba363 (patch) | |
| tree | c3d10278f314c4c157365b2dd1993bfbb315d6bd /bin | |
| parent | d0fdfb0ef0c486cd3b9b8d5af035fd5a2f2227a3 (diff) | |
Make output of configure.bat more readable
* Suppress output of failed SBSv2 instances to the console - they are
available in config.log if required.
* Remove unnecessary '...'s and 'OK's
Reviewed-by: Alex
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/compilercheck.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/compilercheck.pl b/bin/compilercheck.pl index 7203a621ab..825b03f064 100644 --- a/bin/compilercheck.pl +++ b/bin/compilercheck.pl @@ -46,11 +46,11 @@ my $result = `sbs --query=config[armv5_urel] 2>&1`; my $count = length($result); my $idx = index($result, "arm.v5.urel.rvct"); -print "check sbs release armv5 default compiler...\n"; +print "Checking default compiler for 'sbs -c armv5_urel' ...\n"; if ($idx > 0 && $count > ($idx + 20)){ $version_hig = substr($result, $idx+16, 1); $version_low = substr($result, $idx+18, 1); - print "- sbs default release armv5 compiler found: RVCT" . $version_hig . "." . $version_low . "\n"; + print "Default compiler found: RVCT" . $version_hig . "." . $version_low . "\n"; # check if RVCT in sbs config is < 4.0 if($version_hig < 4 && $version_hig >= 2){ @@ -60,23 +60,23 @@ if ($idx > 0 && $count > ($idx + 20)){ $idx = index($result, "."); $rvctversion_hig = substr($result, $idx-1, 1); $rvctversion_low = substr($result, $idx+1, 1); - print "- installed RVCT compiler: RVCT". $rvctversion_hig . "." . $rvctversion_low . "\n"; + print "Installed RVCT compiler: RVCT". $rvctversion_hig . "." . $rvctversion_low . "\n"; #check if installed RVCT is >= 4.0 if( $rvctversion_hig >= 4){ #check if the variable QT_RVCT_VERSION is set to the rvct version $qtvarval = $ENV{'QT_RVCT_VERSION'}; $qtvarshould = $rvctversion_hig. "." .$rvctversion_low; if((length($qtvarval) <= 0) || ($qtvarshould != $qtvarval)){ - print "- Please set enviroment variable QT_RVCT_VERSION="; - print "$rvctversion_hig.$rvctversion_low and run configure again!!!\n"; + print "Error: please set environment variable QT_RVCT_VERSION="; + print "$rvctversion_hig.$rvctversion_low and re-run configure\n"; } } } else{ - print "- OK\n"; + print "OK\n"; } } } else{ - print "- OK\n"; + print "OK\n"; } |