diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 14:57:08 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-31 15:48:27 +0300 |
commit | 0781e6e539b07872f5d2063594a2057f3e31c9ec (patch) | |
tree | d8fbec55e510146f0749426fe98f714701a18250 /bin/patch_capabilities.pl | |
parent | cf28f6cacf59d434072656af05466541ba69e8ae (diff) | |
download | qt4-tools-0781e6e539b07872f5d2063594a2057f3e31c9ec.tar.gz |
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
Diffstat (limited to 'bin/patch_capabilities.pl')
-rwxr-xr-x | bin/patch_capabilities.pl | 9 |
1 files changed, 8 insertions, 1 deletions
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), |