Symbian/beginnings of Series 80 support

Message-ID: <B356D8F434D20B40A8CEDAEC305A1F24E7A67E@esebe105.NOE.Nokia.com>

p4raw-id: //depot/perl@25814

1 files changed, 49 insertions, 21 deletions

diff --git a/symbian/sdk.pl b/symbian/sdk.pl
index 8054c50652..f8eb9c2d4e 100644
--- a/symbian/sdk.pl
+++ b/symbian/sdk.pl
@@ -1,31 +1,48 @@
 use strict;
 
-my $SDK;
+my $SYMBIAN_VERSION;
+my $SYMBIAN_ROOT;
+my $SDK_NAME;
+my $SDK_VARIANT;
+my $SDK_VERSION;
 my $WIN;
 
-if ($ENV{PATH} =~ m!\\Symbian\\(.+?)\\gcc\\bin!) {
-    my $cc = $1;
-    $WIN = $cc =~ m!_CW!i ? 'winscw' : 'wins';
+if ($ENV{PATH} =~ m!\\Symbian\\(.+?)\\(.+?)\\Epoc32\\gcc\\bin!i) {
+    $SYMBIAN_VERSION = $1;
+    $SDK_NAME = $2;
+    $WIN = ($SDK_NAME =~ m!_CW!i || $SDK_NAME eq '8.1a') ?
+	'winscw' : 'wins';
     $ENV{WIN} = $WIN; 
-    if ($cc =~ m!Series60_v20!) {
+    if ($SDK_NAME =~ m!Series60_v20!) {
+	$SDK_VARIANT = 'S60';
 	$ENV{S60SDK} = '2.0';
-    } elsif ($cc =~ m!Series60_v21!) {
-	$ENV{S60SDK} = '2.1';
-    } elsif ($cc =~ m!S60_2nd_FP2!) {
-	$ENV{S60SDK} = '2.6';
+    } elsif ($SDK_NAME =~ m!Series60_v21!) {
+	$SDK_VARIANT = 'S60';
+	$SDK_VERSION = $ENV{S60SDK} = '2.1';
+    } elsif ($SDK_NAME =~ m!S60_2nd_FP2!) {
+	$SDK_VARIANT = 'S60';
+	$SDK_VERSION = $ENV{S60SDK} = '2.6';
+    } elsif ($SDK_NAME =~ m!S60_2nd_FP3!) {
+	$SDK_VARIANT = 'S60';
+	$SDK_VERSION = $ENV{S60SDK} = '2.8';
+    } elsif ($SDK_NAME =~ m!S80_DP2_0_SDK!) {
+	$SDK_VARIANT = 'S80';
+	$SDK_VERSION = $ENV{S80SDK} = '2.0';
     }
 }
 
 if (open(GCC, "gcc -v 2>&1|")) {
    while (<GCC>) {
      if (/Reading specs from ((?:C:)?\\Symbian.+?)\\Epoc32\\/i) {
-       $SDK = $1;
-       # The S60SDK tells the Series 60 SDK version.
-       if ($SDK eq 'C:\Symbian\6.1\Shared') { # Visual C. 
-	   $SDK = 'C:\Symbian\6.1\Series60';
-	   $ENV{S60SDK} = '1.2';
-       } elsif ($SDK eq 'C:\Symbian\Series60_1_2_CW') { # CodeWarrior.
-	   $ENV{S60SDK} = '1.2';
+       $SYMBIAN_ROOT = $1;
+       # The S60SDK/S60SDK tells the Series 60 SDK version.
+       if ($ENV{S60SDK}) {
+	   if ($SYMBIAN_ROOT eq 'C:\Symbian\6.1\Shared') { # Visual C. 
+	       $SYMBIAN_ROOT = 'C:\Symbian\6.1\Series60';
+	       $SDK_VERSION = $ENV{S60SDK} = '1.2';
+	   } elsif ($SYMBIAN_ROOT eq 'C:\Symbian\Series60_1_2_CW') { # CodeWarrior.
+	       $SDK_VERSION = $ENV{S60SDK} = '1.2';
+	   }
        }
        last;
      }
@@ -35,20 +52,21 @@ if (open(GCC, "gcc -v 2>&1|")) {
   die "$0: failed to run gcc: $!\n";
 }
 
+die "$0: failed to locate the Symbian SDK\n" unless defined $SYMBIAN_ROOT;
+
 my $UARM = $ENV{UARM} ? $ENV{UARM} : "urel";
-my $UREL = "$SDK\\epoc32\\release\\-ARM-\\$UARM";
-if ($SDK eq 'C:\Symbian\6.1\Series60' && $ENV{WIN} eq 'winscw') {
+my $UREL = "$SYMBIAN_ROOT\\epoc32\\release\\-ARM-\\$UARM";
+if ($SYMBIAN_ROOT eq 'C:\Symbian\6.1\Series60' && $ENV{WIN} eq 'winscw') {
     $UREL = "C:\\Symbian\\Series60_1_2_CW\\epoc32\\release\\-ARM-\\urel";
 }
 $ENV{UREL} = $UREL;
 $ENV{UARM} = $UARM;
 
-die "$0: failed to locate the Symbian SDK\n" unless defined $SDK;
-
-$SDK;
+[ $SYMBIAN_ROOT, $SYMBIAN_VERSION, $SDK_NAME, $SDK_VARIANT, $SDK_VERSION ];
 
 # The following is a cheat sheet for the right S60/S80 SDK settings.
 #
+# macro.bat:
 # set EPOC_BIN=%EPOCROOT%Epoc32\gcc\bin;%EPOCROOT%Epoc32\Tools
 # set MWCW=C:\Program Files\Metrowerks\CodeWarrior for Symbian OEM v2.8
 # set MSVC=C:\Program Files\Microsoft Visual Studio
@@ -59,12 +77,14 @@ $SDK;
 # s60-1.2-cw:
 #
 # set EPOCROOT=\Symbian\Series60_1_2_CW\
+# macro
 # set PATH=%EPOC_BIN%;%MSVC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES60_12__ -D__SERIES60_MAJOR__=1 -D__SERIES60_MINOR__=2 -D__SERIES60_1X__
 #
 # s60-1.2-vc:
 #
 # set EPOCROOT=\Symbian\6.1\Series60\
+# macro
 # set PATH=\Symbian\6.1\Shared\Epoc32\gcc\bin;\Symbian\6.1\Shared\Epoc32\Tools;%MSVC_BIN%;%PATH%
 # set INCLUDE=%MSVC_INC%
 # set LIB=%MSVC_LIB%
@@ -74,6 +94,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\7.0s\Series60_v20_CW\
 # set EPOCDEVICE=Series60_2_0_CW:com.Nokia.Series60_2_0_CW
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES60_20__ -D__SERIES60_MAJOR__=2 -D__SERIES60_MINOR__=0 -D__SERIES60_2X__
 # 
@@ -81,6 +102,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\7.0s\Series60_v20\
 # set EPOCDEVICE=Series60_v20:com.nokia.series60
+# macro
 # set PATH=%EPOC_BIN%;%MSVC_BIN%;%PATH%
 # set INCLUDE=%MSVC_INC%
 # set LIB=%MSVC_LIB%
@@ -90,6 +112,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\7.0s\Series60_v21_CW\
 # set EPOCDEVICE=Series60_v21_CW:com.Nokia.series60
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES60_21__ -D__SERIES60_MAJOR__=2 -D__SERIES60_MINOR__=1 -D__SERIES60_2X__
 # 
@@ -97,6 +120,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\8.0a\S60_2nd_FP2_CW\
 # set EPOCDEVICE=S60_2nd_FP2_CW:com.nokia.series60
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES60_26__ -D__SERIES60_MAJOR__=2 -D__SERIES60_MINOR__=6 -D__SERIES60_2X__ -D__BLUETOOTH_API_V2__
 # 
@@ -104,6 +128,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\8.0a\S60_2nd_FP2\
 # set EPOCDEVICE=S60_2nd_FP2:com.nokia.Series60
+# macro
 # set PATH=%EPOC_BIN%;%MSVC_BIN%;%PATH%
 # set INCLUDE=%MSVC_INC%
 # set LIB=%MSVC_LIB%
@@ -113,6 +138,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\8.1a\S60_2nd_FP3\
 # set EPOCDEVICE=S60_2nd_FP3:com.nokia.series60
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES60_28__ -D__SERIES60_MAJOR__=2 -D__SERIES60_MINOR__=8 -D__SERIES60_2X__ -D__BLUETOOTH_API_V2__
 # 
@@ -120,6 +146,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\7.0s\S80_DP2_0_SDK_CW\
 # set EPOCDEVICE=Series80_DP2_0_SDK_CW:com.nokia.Series80
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES80_20__ -D__SERIES80_MAJOR__=2 -D__SERIES80_MINOR__=0 -D__SERIES80_2X__
 #
@@ -127,6 +154,7 @@ $SDK;
 #
 # set EPOCROOT=\Symbian\7.0s\S80_DP2_0_SDK\
 # set EPOCDEVICE=Series80_DP2_0_SDK:com.nokia.Series80
+# macro
 # set PATH=%EPOC_BIN%;%MWCW%\Bin;%MWCW%\Symbian_Tools\Command_Line_Tools;%PATH%
 # set USERDEFS=%USERDEFS% -D__SERIES80_20__ -D__SERIES80_MAJOR__=2 -D__SERIES80_MINOR__=0 -D__SERIES80_2X__
 #