X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=symbian%2Fsanity.pl;h=6487c575c354975e4e6508528ed3c33729a84fa8;hb=a22f28a4268aa03ce2bafaf594271b8ff764a5f8;hp=eb50244dde4a5b5c731027ae26cd505ba9c0e9bc;hpb=27da23d53ccce622bc51822f59df8def79b4df95;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/symbian/sanity.pl b/symbian/sanity.pl
index eb50244..6487c57 100644
--- a/symbian/sanity.pl
+++ b/symbian/sanity.pl
@@ -1,18 +1,26 @@
 use strict;
 
 if (exists $ENV{'!C:'}) {
-  print "You are running this under Cygwin, aren't you?\n";
-  print "I'm sorry but only cmd.exe will work.\n";
+  print "You are running this under Cygwin, aren't you? (found '!C' in %ENV)\n";
+  print "Are you perhaps using Cygwin Perl? (\$^O is '$^O')\n" if $^O =~ /cygwin/;
+  print "I'm sorry but only cmd.exe with e.g. the ActivePerl will work.\n";
   exit(1);
 }
 
-if (# SDK 2.x
-    $ENV{PATH} !~ m!c:\\program files\\common files\\symbian\\tools!i
-    &&
-    # SDK 1.2
-    $ENV{PATH} !~ m!c:\\symbian\\6.1\\shared\\epoc32\\tools!i) {
-  print "I think you have not installed the Symbian SDK.\n";
-  exit(1);
+unless(# S60 2.x
+       $ENV{PATH} =~ m!\\program files\\common files\\symbian\\tools!i
+       ||
+       # S60 1.2
+       $ENV{PATH} =~ m!\\symbian\\6.1\\shared\\epoc32\\tools!i
+       ||
+       # S80
+       $ENV{PATH} =~ m!\\s80_.+?\\epoc32\\!i
+       ||
+       # UIQ
+       $ENV{PATH} =~ m!\\uiq_.+?\\epoc32\\!i
+       ) {
+    print "I do not think you have installed a Symbian SDK, your PATH is:\n$ENV{PATH}\n";
+    exit(1);
 }
 
 unless (-f "symbian/symbianish.h") {