diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-08 18:19:19 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-02-09 10:13:46 +0200 |
| commit | b37ac454832a23c17418f5ebca8928b63fe02289 (patch) | |
| tree | 792529a8ec18327c38df1976845aacf2af08a274 /bin | |
| parent | 3b1a0c4877faa9d1d50372f2128c06530ae4b2d4 (diff) | |
Streamlined smart installer package creation in Symbian
- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
"make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct
Task-number: QTBUG-8026
Reviewed-by: axis
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/createpackage.pl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 460df31e0d..6d4614eb42 100755 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -95,10 +95,10 @@ Example with certfile: # This is comment line, also the empty lines are ignored rd.cer;rd-key.pem .\\cert\\mycert.cer;.\\cert\\mykey.key;yourpassword - X:\\QtS60\\selfsigned.cer;X:\\QtS60\\selfsigned.key + X:\\QtS60\\s60installs\\selfsigned.cer;X:\\QtS60\\s60installs\\selfsigned.key If no certificate and key files are provided, either a RnD certificate or -a self-signed certificate from Qt installation root directory is used. +a self-signed certificate from QtDir\\src\\s60installs directory is used. ============================================================================================== ENDUSAGESTRING @@ -149,8 +149,10 @@ $pkgoutputbasename = lc($pkgoutputbasename); # Store output file names to variables my $pkgoutput = lc($pkgoutputbasename.".pkg"); -my $unsigned_sis_name = $pkgoutputbasename."_unsigned.sis"; -my $signed_sis_name = $pkgoutputbasename.".sis"; +my $sisoutputbasename = lc($pkgoutputbasename); +$sisoutputbasename =~ s/_$targetplatform//g; +my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis"; +my $signed_sis_name = $sisoutputbasename.".sis"; # Store some utility variables my $scriptpath = dirname(__FILE__); @@ -263,7 +265,11 @@ system ("signsis $unsigned_sis_name $signed_sis_name $certificate $key $passphra # Check if creating signed SIS Succeeded stat($signed_sis_name); if( -e _ ) { - print ("\nSuccessfully created $signed_sis_name using certificate: $certtext!\n"); + my $targetInsert = ""; + if ($targetplatform ne "-") { + $targetInsert = "for $targetplatform "; + } + print ("\nSuccessfully created $signed_sis_name ${targetInsert}using certificate: $certtext!\n"); # Sign with additional certificates & keys for my $row ( @certificates ) { |