Backport r30323/r30169 - perl use if/elsif/else so that it'll build with both new and old perl.

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_9@30406 a1c6a512-1295-4272-9138-f99709370657

tools/multigcc.pl

@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-use Switch;
 use List::Util 'shuffle'; # standard from Perl 5.8 and later
 
 my $tempfile = "multigcc.out";
@@ -26,16 +25,16 @@ my $command = join " ", @params;
 
 # count number of cores
 my $cores;
-switch($^O) {
+# Don't use given/when here - it's not compatible with old perl versions
-    case "darwin" {
+if ($^O eq 'darwin') {
     chomp($cores = `sysctl -n hw.ncpu`);
     $cores = 1 if ($?);
-    }
+}
-    case "solaris" {
+elsif ($^O eq 'solaris') {
     $cores = scalar grep /on-line/i, `psrinfo`;
     $cores = 1 if ($?);
-    }
+}
-    else {
+else {
     if (open CPUINFO, "</proc/cpuinfo") {
         $cores = scalar grep /^processor/i, <CPUINFO>;
         close CPUINFO;
@@ -43,7 +42,6 @@ switch($^O) {
     else {
         $cores = 1;
     }
-    }
 }
 
 # fork children

tools/voice.pl

@@ -19,7 +19,6 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Copy;
-use Switch;
 use vars qw($V $C $t $l $e $E $s $S $i $v);
 use IPC::Open2;
 use IPC::Open3;
@@ -74,8 +73,8 @@ sub init_tts {
     our $verbose;
     my ($tts_engine, $tts_engine_opts, $language) = @_;
     my %ret = ("name" => $tts_engine);
-    switch($tts_engine) {
+    # Don't use given/when here - it's not compatible with old perl versions
-        case "festival" {
+    if ($tts_engine eq 'festival') {
         print("> festival $tts_engine_opts --server\n") if $verbose;
         my $pid = open(FESTIVAL_SERVER, "| festival $tts_engine_opts --server > /dev/null 2>&1");
         my $dummy = *FESTIVAL_SERVER; #suppress warning
@@ -83,7 +82,7 @@ sub init_tts {
         $SIG{KILL} = sub { kill TERM => $pid; print("boo"); panic_cleanup(); };
         $ret{"pid"} = $pid;
     }
-        case "sapi" {
+    elsif ($tts_engine eq 'sapi') {
         my $toolsdir = dirname($0);
         my $path = `cygpath $toolsdir -a -w`;
         chomp($path);
@@ -104,23 +103,20 @@ sub init_tts {
                 "stdout" => *CMD_OUT,
                 "vendor" => $vendor);
     }
-    }
     return \%ret;
 }
 
 # Shutdown TTS engine if necessary.
 sub shutdown_tts {
     my ($tts_object) = @_;
-    switch($$tts_object{"name"}) {
+    if ($$tts_object{'name'} eq 'festival') {
-        case "festival" {
         # Send SIGTERM to festival server
         kill TERM => $$tts_object{"pid"};
     }
-        case "sapi" {
+    elsif ($$tts_object{'name'} eq 'sapi') {
         print({$$tts_object{"stdin"}} "QUIT\r\n");
         close($$tts_object{"stdin"});
     }
-    }
 }
 
 # Apply corrections to a voice-string to make it sound better
@@ -146,9 +142,9 @@ sub voicestring {
     our $verbose;
     my ($string, $output, $tts_engine_opts, $tts_object) = @_;
     my $cmd;
-    printf("Generate \"%s\" with %s in file %s\n", $string, $$tts_object{"name"}, $output) if $verbose;
+    my $name = $$tts_object{'name'};
-    switch($$tts_object{"name"}) {
+    printf("Generate \"%s\" with %s in file %s\n", $string, $name, $output) if $verbose;
-        case "festival" {
+    if ($name eq 'festival') {
         # festival_client lies to us, so we have to do awful soul-eating
         # work with IPC::open3()
         $cmd = "festival_client --server localhost --otype riff --ttw --output \"$output\"";
@@ -168,27 +164,26 @@ sub voicestring {
         close(CMD_OUT);
         close(CMD_ERR);
     }
-        case "flite" {
+    elsif ($name eq 'flite') {
         $cmd = "flite $tts_engine_opts -t \"$string\" \"$output\"";
         print("> $cmd\n") if $verbose;
         `$cmd`;
     }
-        case "espeak" {
+    elsif ($name eq 'espeak') {
         $cmd = "espeak $tts_engine_opts -w \"$output\"";
         print("> $cmd\n") if $verbose;
         open(ESPEAK, "| $cmd");
         print ESPEAK $string . "\n";
         close(ESPEAK);
     }
-        case "sapi" {
+    elsif ($name eq 'sapi') {
         print({$$tts_object{"stdin"}} "SPEAK\t$output\t$string\r\n");
     }
-        case "swift" {
+    elsif ($name eq 'swift') {
         $cmd = "swift $tts_engine_opts -o \"$output\" \"$string\"";
         print("> $cmd\n") if $verbose;
         system($cmd);
     }
-    }
 }
 
 # trim leading / trailing silence from the clip