Changed createpackage parameters to be more consistent with make targets.

Earlier createpackage required two separate parameters to define the
platform and target. For example
    > createpackage fluidlauncher_template.pkg release armv5

Now it is changed to:
    > createpackage fluidlauncher_template.pkg release-armv5

This is consistent to make target what is used to do the building i.e.:
    > make release-armv5

The change also affected environment variables supported by 'make sisx'
target. QT_SISX_PLATFORM is not any more supported, and the info is
merged QT_SISX_TARGET variable.

Reviewed-by: Miikka Heikkinen

1 files changed, 15 insertions, 15 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 856f318..b7f4682 100644
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -20,18 +20,21 @@ sub Usage() {
     print "==========================================================================================\n";
     print "Convenience script for creating signed packages you can install on your phone.\n";
     print "\n";
-    print "Usage: createpackage.pl [-i] templatepkg platform target [certificate key [passphrase]]\n";
+    print "Usage: createpackage.pl [-i] templatepkg target-platform [certificate key [passphrase]]\n";
     print "\n";
     print "Where parameters are as follows:\n";
     print "     [-i|install] = Install the package right away using PC suite\n";
     print "     templatepkg  = Name of .pkg file template\n";
-    print "     target       = Either debug|udeb or release|urel\n";    
+    print "     target       = Either debug or release\n";    
     print "     platform     = One of the supported platform\n";
     print "                    winscw | gcce | armv5 | armv6 | armv7\n";
     print "     certificate  = The certificate file used for signing\n";
     print "     key          = The certificate's private key file\n";
     print "     passphrase   = The certificate's private key file's passphrase\n";
     print "\n";
+    print "For example:\n";    
+    print "     createpackage.pl fluidlauncher_template.pkg release-armv5\n";        
+    print "\n";
     print "If no certificate and key files are provided, either a RnD certificate or\n";
     print "a self-signed certificate from Qt installation root directory is used.\n";
     print "\n";
@@ -47,26 +50,23 @@ unless (GetOptions('i|install' => \$install)){
 
 # Read params to variables
 my $templatepkg = $ARGV[0];
-my $target = uc $ARGV[1];
-my $platform = uc $ARGV[2];
+my $targetplatform = uc $ARGV[1];
+
+my @tmpvalues = split('-', $targetplatform);
+my $target = $tmpvalues[0];
+my $platform = $tmpvalues[1];;
 
-# Make sure target contains only urel/udeb. 
-# i.e. convert possible given debug->udeb and release->urel
+# Convert visual target to real target (debug->udeb and release->urel)
 $target =~ s/debug/udeb/i;
 $target =~ s/release/urel/i;
 
-# Make sure visual target contains only release/debug
-my $visualtarget = $target;
-$visualtarget =~ s/udeb/debug/i;
-$visualtarget =~ s/urel/release/i;
-
-my $certificate = $ARGV[3];
-my $key = $ARGV[4];
-my $passphrase = $ARGV[5];
+my $certificate = $ARGV[2];
+my $key = $ARGV[3];
+my $passphrase = $ARGV[4];
 
 # Generate output pkg basename (i.e. file name without extension)
 my $pkgoutputbasename = $templatepkg;
-$pkgoutputbasename =~ s/_template\.pkg/_$visualtarget-$platform/g;
+$pkgoutputbasename =~ s/_template\.pkg/_$targetplatform/g;
 $pkgoutputbasename = lc($pkgoutputbasename);
 
 # Store output file names to variables