Fix gcce building of apps using static libraries in symbian-sbsv2

Removed usage of buggy .release_gcce target from symbian-sbsv2
generated makefiles. Now gcce builds like armv5 as it is supposed to
when using Raptor.

Task-number: QTBUG-13307
Reviewed-by: axis

2 files changed, 24 insertions, 2 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 984c1fdaae..2569a66733 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -81,11 +81,14 @@ Where supported options are as follows:
      [-o|only-unsigned]      = Creates only unsigned package.
      [-s|stub]               = Generates stub sis for ROM.
      [-n|sisname <name>]     = Specifies the final sis name.
+     [-g|gcce-is-armv5]      = Convert gcce platform to armv5.
 Where parameters are as follows:
      templatepkg             = Name of .pkg file template
      target                  = Either debug or release
      platform                = One of the supported platform
                                winscw | gcce | armv5 | armv6 | armv7
+                               Note that when packaging binaries built using gcce and symbian-sbsv2
+                               mkspec, armv5 must be used for platform instead of gcce.
      certificate             = The certificate file used for signing
      key                     = The certificate's private key file
      passphrase              = The passphrase of the certificate's private key file
@@ -123,6 +126,7 @@ my $preserveUnsigned = "";
 my $stub = "";
 my $signed_sis_name = "";
 my $onlyUnsigned = "";
+my $convertGcce = "";
 
 unless (GetOptions('i|install' => \$install,
                    'p|preprocess' => \$preprocessonly,
@@ -130,7 +134,8 @@ unless (GetOptions('i|install' => \$install,
                    'u|unsigned' => \$preserveUnsigned,
                    'o|only-unsigned' => \$onlyUnsigned,
                    's|stub' => \$stub,
-                   'n|sisname=s' => \$signed_sis_name,)) {
+                   'n|sisname=s' => \$signed_sis_name,
+                   'g|gcce-is-armv5' => \$convertGcce,)) {
     Usage();
 }
 
@@ -146,6 +151,16 @@ $target = $tmpvalues[0] or $target = "";
 my $platform;
 $platform = $tmpvalues[1] or $platform = "";
 
+if ($platform =~ m/^gcce$/i) {
+    if (($convertGcce ne "")) {
+        $platform = "armv5";
+    } elsif ($ENV{SBS_HOME}) {
+        # Print a informative note in case suspected misuse is detected.
+        print "\nNote: You should use armv5 as platform or specify -g parameter to convert platform\n";
+        print "      when packaging gcce binaries built using symbian-sbsv2 mkspec.\n\n";
+    }
+}
+
 # Convert visual target to real target (debug->udeb and release->urel)
 $target =~ s/debug/udeb/i;
 $target =~ s/release/urel/i;
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 7d6f5dc163..0c0538c476 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -54,7 +54,9 @@ sub Usage() {
     print("If no capabilities are given, the binaries will be given the\n");
     print("capabilities supported by self-signed certificates.\n\n");
     print(" *** NOTE: If *_template.pkg file is given and one is using symbian-abld or\n");
-    print(" symbian-sbsv2 platform, 'target-platform' is REQUIRED. ***\n");
+    print(" symbian-sbsv2 platform, 'target-platform' is REQUIRED. ***\n\n");
+    print(" *** NOTE2: When patching gcce binaries built with symbian-sbsv2 toolchain,\n");
+    print(" armv5 must be specified as platform.\n");
     print("\nUsage: patch_capabilities.pl pkg_filename [target-platform [capability list]]\n");
     print("\nE.g. patch_capabilities.pl myapp_template.pkg release-armv5 \"All -TCB\"\n");
     exit();
@@ -104,6 +106,11 @@ if (@ARGV)
         # Convert visual target to real target (debug->udeb and release->urel)
         $target =~ s/debug/udeb/i;
         $target =~ s/release/urel/i;
+
+        if (($platform =~ m/^gcce$/i) && ($ENV{SBS_HOME})) {
+            # Print a informative note in case suspected misuse is detected.
+            print "\nNote: You must use armv5 as platform when packaging gcce binaries built using symbian-sbsv2 mkspec.\n";
+        }
     }
 
     # If the specified ".pkg" file exists (and can be read),