From 0fc2735a80300139510933e2b8856f6c7fbc9a2b Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 16 Mar 2010 15:12:29 +0100 Subject: Fixed "Cannot install protected application" message on Symbian. This was due the patch_capabilities step running too late in the sis creation process. This led to the package ID being wrong the first time "make sis" was run, but correct on subsequent runs. RevBy: Trust me Task: QTBUG-8770 --- bin/createpackage.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/createpackage.pl b/bin/createpackage.pl index c16c692..554d619 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -237,6 +237,11 @@ if (!$preservePkgOutput) { } # Preprocess PKG +if ($certtext eq "Self Signed" && !@certificates) { + print("Patching capabilities for self signed package $certificate\n"); + system ("patch_capabilities $templatepkg $targetplatform"); +} + local $/; # read template file open( TEMPLATE, $templatepkg) or die "Error '$templatepkg': $!\n"; @@ -272,10 +277,6 @@ if($stub) { # Create stub SIS. system ("makesis -s $pkgoutput $stub_sis_name"); } else { - if ($certtext eq "Self Signed" && !@certificates) { - print("Patching capabilities for self signed package $certificate\n"); - system ("patch_capabilities $templatepkg $targetplatform"); - } # Create SIS. # The 'and' is because system uses 0 to indicate success. system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed"); -- cgit v0.12