diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2005-11-07 15:32:15 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-11-07 11:39:57 +0000 |
| commit | d0d72822ba0a68d160ea4c98ca80f24b8f73969b (patch) | |
| tree | 735ce6a98b4d91d05a26f9573f8e62ca8f91738f /symbian/xsbuild.pl | |
| parent | 7d0beb42a2610634ab455d4519a64df3ca90bc2f (diff) | |
| download | perl-d0d72822ba0a68d160ea4c98ca80f24b8f73969b.tar.gz | |
Symbian update blead@26025
Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A70C@esebe105.NOE.Nokia.com>
p4raw-id: //depot/perl@26030
Diffstat (limited to 'symbian/xsbuild.pl')
| -rw-r--r-- | symbian/xsbuild.pl | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/symbian/xsbuild.pl b/symbian/xsbuild.pl index adde60ee61..b98b4af68c 100644 --- a/symbian/xsbuild.pl +++ b/symbian/xsbuild.pl @@ -35,8 +35,9 @@ my $Sis; sub usage { die <<__EOF__; $0: Usage: $0 [--symbian=version] [--perl=version] - [--csuffix=csuffix] [--cplusplus] - [--win=win] [--arm=arm] + [--extversion=x.y] + [--csuffix=csuffix] [--cplusplus|--cpp] + [--win=win] [--arm=arm] [--config|--build|--clean|--distclean|--sis] ext __EOF__ } @@ -73,19 +74,22 @@ if ($CoreBuild) { $PerlVersion = $R_V_SV; } +my %CONF; + usage() unless GetOptions( - 'symbian=s' => \$SymbianVersion, - 'perl=s' => \$PerlVersion, - 'csuffix=s' => \$CSuffix, - 'cplusplus' => \$CPlusPlus, - 'win=s' => \$WIN, - 'arm=s' => \$ARM, - 'config' => \$Config, - 'build' => \$Build, - 'clean' => \$Clean, - 'distclean' => \$DistClean, - 'sis' => \$Sis + 'symbian=s' => \$SymbianVersion, + 'perl=s' => \$PerlVersion, + 'extversion=s' => \$CONF{EXTVERSION}, + 'csuffix=s' => \$CSuffix, + 'cplusplus|cpp' => \$CPlusPlus, + 'win=s' => \$WIN, + 'arm=s' => \$ARM, + 'config' => \$Config, + 'build' => \$Build, + 'clean' => \$Clean, + 'distclean' => \$DistClean, + 'sis' => \$Sis ); usage() unless @ARGV; @@ -128,7 +132,6 @@ if (exists $ENV{UREL}) { $SRCDBG = $UARM eq 'udeb' ? "SRCDBG" : ""; } -my %CONF; my %EXTCFG; sub write_bld_inf { @@ -689,7 +692,7 @@ sub update_cwd { for my $ext (@ARGV) { $ext =~ s!::!\\!g; - my $extdash = "ext\\$ext"; $extdash =~ s!\\!-!g; + my $extdash = $ext =~ /ext\\/ ? $ext : "ext\\$ext"; $extdash =~ s!\\!-!g; $ext =~ s!/!\\!g; my $cfg; |