diff options
| author | Nicholas Clark <nick@ccl4.org> | 2007-01-08 21:20:26 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2007-01-08 21:20:26 +0000 |
| commit | 9e68dc58065b5262473cdb64ccaeca78b471b4aa (patch) | |
| tree | 4c6010205cc62e3f79dff3aa7dc7ac005ccccab8 /symbian | |
| parent | 2b6b30b36dd9a844ed1bbf75bb9cb50b06ceadc7 (diff) | |
| download | perl-9e68dc58065b5262473cdb64ccaeca78b471b4aa.tar.gz | |
do $file; won't propagate errors from die, as do is an implicit eval.
So need to propagate errors with $@.
p4raw-id: //depot/perl@29723
Diffstat (limited to 'symbian')
| -rw-r--r-- | symbian/config.pl | 10 | ||||
| -rw-r--r-- | symbian/makesis.pl | 10 | ||||
| -rw-r--r-- | symbian/xsbuild.pl | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/symbian/config.pl b/symbian/config.pl index 52b6e71a67..f35efb62e8 100644 --- a/symbian/config.pl +++ b/symbian/config.pl @@ -9,9 +9,9 @@ use lib "symbian"; print "Configuring...\n"; print "Configuring with: Perl version $] ($^X)\n"; -do "sanity.pl"; +do "sanity.pl" or die $@; -my %VERSION = %{ do "version.pl" }; +my %VERSION = %{ do "version.pl" or die $@ }; printf "Configuring for: Perl version $VERSION{REVISION}.%03d%03d\n", $VERSION{VERSION}, $VERSION{SUBVERSION}; @@ -20,8 +20,8 @@ my $VERSION = "$VERSION{REVISION}$VERSION{VERSION}$VERSION{SUBVERSION}"; my $R_V_SV = "$VERSION{REVISION}.$VERSION{VERSION}.$VERSION{SUBVERSION}"; my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) = - @{ do "sdk.pl" }; -my %PORT = %{ do "port.pl" }; + @{ do "sdk.pl" or die $@ }; +my %PORT = %{ do "port.pl" or die $@ }; if ($SYMBIAN_ROOT eq 'C:\Symbian\Series60_1_2_CW') { ( $SYMBIAN_VERSION, $SDK_VERSION ) = qw(6.1 1.2); @@ -48,7 +48,7 @@ die "$0: does not know which Windows compiler to use\n" print "Symbian $SYMBIAN_VERSION SDK $SDK_VARIANT $SDK_VERSION ($WIN) installed at $SYMBIAN_ROOT\n"; -my $CWD = do "cwd.pl"; +my $CWD = do "cwd.pl" or die $@; print "Build directory $CWD\n"; die "$0: '+' in cwd does not work with Series 60 SDK 1.2\n" diff --git a/symbian/makesis.pl b/symbian/makesis.pl index dbf533ce7b..377a7c72be 100644 --- a/symbian/makesis.pl +++ b/symbian/makesis.pl @@ -5,16 +5,16 @@ use strict; use lib "symbian"; -do "sanity.pl"; +do "sanity.pl" or die $@; -my %VERSION = %{ do "version.pl" }; +my %VERSION = %{ do "version.pl" or die $@ }; my $VERSION = "$VERSION{REVISION}$VERSION{VERSION}$VERSION{SUBVERSION}"; my $R_V_SV = "$VERSION{REVISION}.$VERSION{VERSION}.$VERSION{SUBVERSION}"; my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) = - @{ do "sdk.pl" }; -my $UID = do "uid.pl"; -my %PORT = %{ do "port.pl" }; + @{ do "sdk.pl" or die $@ }; +my $UID = do "uid.pl" or die $@; +my %PORT = %{ do "port.pl" or die $@ }; my $ARM = 'thumb'; # TODO my $S60SDK = $ENV{S60SDK}; # from sdk.pl diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index aee912a1ae..293e702eec 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -6,7 +6,7 @@ use Getopt::Long; use File::Basename; use Cwd; -do "sanity.pl"; +do "sanity.pl" or die $@; my $CoreBuild = -d "ext" && -f "perl.h" && -d "symbian" && -f "perl.c"; @@ -64,13 +64,13 @@ my ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION); if ($CoreBuild) { unshift @INC, "symbian"; - do "sanity.pl"; - my %VERSION = %{ do "version.pl" }; + do "sanity.pl" or die $@; + my %VERSION = %{ do "version.pl" or die $@ }; ($SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION) = - @{ do "sdk.pl" }; + @{ do "sdk.pl" or die $@ }; $VERSION = "$VERSION{REVISION}$VERSION{VERSION}$VERSION{SUBVERSION}"; $R_V_SV = "$VERSION{REVISION}.$VERSION{VERSION}.$VERSION{SUBVERSION}"; - $BUILDROOT = do "cwd.pl"; + $BUILDROOT = do "cwd.pl" or die $@; $PerlVersion = $R_V_SV; } |