diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2005-10-17 14:49:20 +0300 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-10-17 08:28:15 +0000 |
| commit | c8f896e512be5e426c2aacff476dd115e4fd2b1f (patch) | |
| tree | 2bc3ef7bfd026558f198b434f8bc04edd69ec1ab /symbian/xsbuild.pl | |
| parent | 22162ca81623f0ce6683af5e97b91bf10ad89079 (diff) | |
| download | perl-c8f896e512be5e426c2aacff476dd115e4fd2b1f.tar.gz | |
blead@25775 Symbian update
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A60A@esebe105.NOE.Nokia.com>
p4raw-id: //depot/perl@25776
Diffstat (limited to 'symbian/xsbuild.pl')
| -rw-r--r-- | symbian/xsbuild.pl | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index f4140a96c0..556db70e33 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -34,8 +34,8 @@ my $SDK; my $VERSION; my $R_V_SV; my $PERLSDK; -my $WIN; -my $ARM; +my $WIN = 'wins'; +my $ARM = 'thumb'; my $BUILDROOT = getcwd(); if ( !defined $PerlVersion && $0 =~ m:\\symbian\\perl\\(.+)\\bin\\xsbuild.pl:i ) @@ -101,15 +101,22 @@ $PERLSDK = "\\Symbian\\Perl\\$PerlVersion"; $R_V_SV = $PerlVersion; -$VERSION =~ tr/.//d; +$VERSION = $PerlVersion unless defined $VERSION; + +$VERSION =~ tr/.//d if defined $VERSION; $ENV{SDK} = $SDK; # For the Errno extension $ENV{CROSS} = 1; # For the Encode extension -my $UREL = $ENV{UREL}; # from sdk.pl -$UREL =~ s/-ARM-/$ARM/; -my $UARM = $ENV{UARM}; # from sdk.pl -my $SRCDBG = $UARM eq 'udeb' ? "SRCDBG" : ""; +my $UARM = 'urel'; +my $UREL = "$SDK\\epoc32\\release\\-ARM-\\$UARM"; +my $SRCDBG; +if (exists $ENV{UREL}) { + $UREL = $ENV{UREL}; # from sdk.pl + $UREL =~ s/-ARM-/$ARM/; + $UARM = $ENV{UARM}; # from sdk.pl + $SRCDBG = $UARM eq 'udeb' ? "SRCDBG" : ""; +} my %CONF; my %EXTCFG; @@ -379,7 +386,7 @@ sub update_dir { sub xsconfig { my ( $ext, $dir ) = @_; - print "Configuring for $ext, directory $dir...\n"; + print "Configuring for $ext, directory '$dir'...\n"; my $extu = $CoreBuild ? "$BUILDROOT\\lib\\ExtUtils" : "$PERLSDK\\lib\\ExtUtils"; update_dir($dir) or die "$0: chdir '$dir': $!\n"; my $build = dirname($ext); @@ -743,7 +750,7 @@ for my $ext (@ARGV) { # (3) With an updated _init.c that carries the symbols from step (2). system_echo("make clean"); - system_echo("make defrost") == 0 or die "$0: make defrost failed\n"; + system_echo("make defrost") == 0 or warn "$0: make defrost failed\n"; my @TARGET; |