FCL/sf/mw/qt: comparison bin/createpackage.pl

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 ==============================================================================================
 Convenience script for creating signed packages you can install on your phone.
 Usage: createpackage.pl [options] templatepkg [target]-[platform] [certificate key [passphrase]]
-Where supported optiobns are as follows:
+Where supported options are as follows:
-[-i|install]            = Install the package right away using PC suite
+[-i|install]            = Install the package right away using PC suite.
 [-p|preprocess]         = Only preprocess the template .pkg file.
-[-c|certfile=<file>]    = The file containing certificate information for signing.
+[-c|certfile <file>]    = The file containing certificate information for signing.
 The file can have several certificates, each specified in
 separate line. The certificate, key and passphrase in line
 must be ';' separated. Lines starting with '#' are treated
 as a comments. Also empty lines are ignored. The paths in
 <file> can be absolute or relative to <file>.
-[-u|unsigned]           = Preserves the unsigned package
+[-u|unsigned]           = Preserves the unsigned package.
+[-s|stub]               = Generates stub sis for ROM.
+[-n|sisname <name>]     = Specifies the final sis name.
 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
 certificate             = The certificate file used for signing
 key                     = The certificate's private key file
-passphrase              = The certificate's private key file's passphrase
+passphrase              = The passphrase of the certificate's private key file
 Example:
 createpackage.pl fluidlauncher_template.pkg release-armv5
 Example with certfile:
 .\\cert\\mycert.cer;.\\cert\\mykey.key;yourpassword
 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 QtDir\\src\\s60installs directory is used.
+In the latter case the resulting package will also be automatically patched
+using patch_capabilities.pl script, which makes it unsuitable for distribution.
+Always specify certificates explicitly if you wish to distribute your package.
 ==============================================================================================
 ENDUSAGESTRING
 exit();
 my $install = "";
 my $preprocessonly = "";
 my $certfile = "";
 my $preserveUnsigned = "";
 my $stub = "";
+my $signed_sis_name = "";
 unless (GetOptions('i|install' => \$install,
 'p|preprocess' => \$preprocessonly,
 'c|certfile=s' => \$certfile,
 'u|unsigned' => \$preserveUnsigned,
-'s|stub' => \$stub,)){
+'s|stub' => \$stub,
+'n|sisname=s' => \$signed_sis_name,)) {
 Usage();
 }
 my $certfilepath = abs_path(dirname($certfile));
 # Read params to variables
 my $templatepkg = $ARGV[0];
 my $targetplatform = lc $ARGV[1];
 my @tmpvalues = split('-', $targetplatform);
-my $target = $tmpvalues[0];
+my $target;
-my $platform = $tmpvalues[1];;
+$target = $tmpvalues[0] or $target = "";
+my $platform;
+$platform = $tmpvalues[1] or $platform = "";
 # Convert visual target to real target (debug->udeb and release->urel)
 $target =~ s/debug/udeb/i;
 $target =~ s/release/urel/i;
-my $certificate = $ARGV[2];
+my $certificate;
-my $key = $ARGV[3];
+$certificate = $ARGV[2] or $certificate = "";
-my $passphrase = $ARGV[4];
+my $key;
+$key = $ARGV[3] or $key = "";
+my $passphrase;
+$passphrase = $ARGV[4] or $passphrase = "";
 # Generate output pkg basename (i.e. file name without extension)
 my $pkgoutputbasename = $templatepkg;
 my $preservePkgOutput = "";
 $pkgoutputbasename =~ s/_template/_$targetplatform/g;
 if ($pkgoutputbasename eq $templatepkg) {
 $preservePkgOutput = "1";
 }
 $pkgoutputbasename =~ s/\.pkg//g;
-$pkgoutputbasename = lc($pkgoutputbasename);
+$pkgoutputbasename = $pkgoutputbasename;
 # Store output file names to variables
-my $pkgoutput = lc($pkgoutputbasename.".pkg");
+my $pkgoutput = $pkgoutputbasename.".pkg";
-my $sisoutputbasename = lc($pkgoutputbasename);
+my $sisoutputbasename;
-$sisoutputbasename =~ s/_$targetplatform//g;
+if ($signed_sis_name eq "") {
+$sisoutputbasename = $pkgoutputbasename;
+$sisoutputbasename =~ s/_$targetplatform//g;
+$signed_sis_name = $sisoutputbasename.".sis";
+} else {
+$sisoutputbasename = $signed_sis_name;
+if ($sisoutputbasename =~ m/(\.sis$|\.sisx$)/i) {
+$sisoutputbasename =~ s/$1//i;
+} else {
+$signed_sis_name = $signed_sis_name.".sis";
+}
+}
 my $unsigned_sis_name = $sisoutputbasename."_unsigned.sis";
-my $signed_sis_name = $sisoutputbasename.".sis";
+my $stub_sis_name = $sisoutputbasename.".sis";
-my $stub_sis_name = $sisoutputbasename."_stub.sis";
 # Store some utility variables
 my $scriptpath = dirname(__FILE__);
 my $certtext = $certificate;
-my $certpath = $scriptpath;
+# certificates are one step up in hierarchy
-$certpath =~ s-^(.*[^\\])$-$1\\-o;          # ensure path ends with a backslash
+my $certpath = File::Spec->catdir($scriptpath, File::Spec->updir(), "src/s60installs/");
-$certpath =~ s-/-\\-go;                     # for those working with UNIX shells
-$certpath =~ s-bin\\$-src\\s60installs\\-;  # certificates are one step up in hierarcy
 # Check some pre-conditions and print error messages if needed.
 unless (length($templatepkg)) {
 print "\nError: Template PKG filename is not defined!\n";
 Usage();
-}
-# If the pkg file is not actually a template, there is no need for plaform or target.
-if ($templatepkg =~ m/_template\.pkg/i) {
-unless (length($platform) && length($target)) {
-print "\nError: Platform or target is not defined!\n";
-Usage();
-}
 }
 # Check template exist
 stat($templatepkg);
 unless( -e _ ) {
 Usage();
 }
 } else {
 #If no certificate is given, check default options
 $certtext = "RnD";
-$certificate = $certpath."rd.cer";
+$certificate = File::Spec->catfile($certpath, "rd.cer");
-$key = $certpath."rd-key.pem";
+$key = File::Spec->catfile($certpath, "rd-key.pem");
 stat($certificate);
 unless( -e _ ) {
 $certtext = "Self Signed";
-$certificate = $certpath."selfsigned.cer";
+$certificate = File::Spec->catfile($certpath, "selfsigned.cer");
-$key = $certpath."selfsigned.key";
+$key = File::Spec->catfile($certpath, "selfsigned.key");
 }
 }
 # Read the certificates from file to two dimensional array
 my @certificates;
 if (!$preservePkgOutput) {
 unlink $pkgoutput;
 }
 # Preprocess PKG
 local $/;
 # read template file
 open( TEMPLATE, $templatepkg) or die "Error '$templatepkg': $!\n";
 $_=<TEMPLATE>;
 close (TEMPLATE);
+# If the pkg file does not contain macros, there is no need for platform or target.
+if (m/\$\(PLATFORM\)/) {
+unless (length($platform) && length($target)) {
+print "\nError: Platform or target is not defined!\n";
+Usage();
+}
+}
 # replace the PKG variables
 s/\$\(PLATFORM\)/$platform/gm;
 s/\$\(TARGET\)/$target/gm;
 mkpath($systeminstall);
 my $stub_sis_name = $systeminstall."/".$stub_sis_name;
 # Create stub SIS.
 system ("makesis -s $pkgoutput $stub_sis_name");
 } else {
+if ($certtext eq "Self Signed" && !@certificates && $templatepkg !~ m/_installer\.pkg$/i) {
+print("Auto-patching capabilities for self signed package.\n");
+system ("patch_capabilities $pkgoutput");
+}
 # Create SIS.
-system ("makesis $pkgoutput $unsigned_sis_name");
+# The 'and' is because system uses 0 to indicate success.
+system ("makesis $pkgoutput $unsigned_sis_name") and die ("makesis failed");
 print("\n");
 # Sign SIS with certificate info given as an argument.
-system ("signsis $unsigned_sis_name $signed_sis_name $certificate $key $passphrase");
+my $relcert = File::Spec->abs2rel($certificate);
+my $relkey = File::Spec->abs2rel($key);
+# The 'and' is because system uses 0 to indicate success.
+system ("signsis $unsigned_sis_name $signed_sis_name $relcert $relkey $passphrase") and die ("signsis failed");
 # Check if creating signed SIS Succeeded
 stat($signed_sis_name);
 if( -e _ ) {
 my $targetInsert = "";
 print ("Successfully created $signed_sis_name ${targetInsert}using certificate: $certtext!\n");
 # Sign with additional certificates & keys
 for my $row ( @certificates ) {
 # Get certificate absolute file names, relative paths are relative to certfilepath
-my $abscert = File::Spec->rel2abs( $row->[0], $certfilepath);
+my $relcert = File::Spec->abs2rel(File::Spec->rel2abs( $row->[0], $certfilepath));
-my $abskey = File::Spec->rel2abs( $row->[1], $certfilepath);
+my $relkey = File::Spec->abs2rel(File::Spec->rel2abs( $row->[1], $certfilepath));
-system ("signsis $signed_sis_name $signed_sis_name $abscert $abskey $row->[2]");
+system ("signsis $signed_sis_name $signed_sis_name $relcert $relkey $row->[2]");
 print ("\tAdditionally signed the SIS with certificate: $row->[0]!\n");
 }
 # remove temporary pkg and unsigned sis
 if (!$preservePkgOutput) {

changeset 30	5dc02b23752f
parent 18	2f34d5167611
child 33	3e2da88830cd