From 7f08c316c4accf21c37ba75b299ca3504cb1a2ec Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Thu, 27 Aug 2009 09:34:44 +0300 Subject: Fixed createpackage.bat params to be more consistent with make targets. Createpackage.bat now accepts also release/debug instead of urel/udeb. Also the order is swicthed so that now you need to call: >createpackage.bat [-i] pkgfile release armv5 [certificate key [passphrase]] instead of >createpackage.bat [-i] pkgfile armv5 urel [certificate key [passphrase]] RevBy: Miikka Heikkinen --- bin/createpackage.pl | 15 +++++++++++---- qmake/generators/symbian/symmake.cpp | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/createpackage.pl b/bin/createpackage.pl index 8501174..856f318 100644 --- a/bin/createpackage.pl +++ b/bin/createpackage.pl @@ -25,9 +25,9 @@ sub Usage() { 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 " platform = One of the supported platform\n"; - print " GCCE | ARMV5 | ARMV6 | ARMV7\n"; - print " target = Either UDEB or UREL\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"; @@ -47,8 +47,15 @@ unless (GetOptions('i|install' => \$install)){ # Read params to variables my $templatepkg = $ARGV[0]; -my $platform = uc $ARGV[1]; -my $target = uc $ARGV[2]; +my $target = uc $ARGV[1]; +my $platform = uc $ARGV[2]; + +# Make sure target contains only urel/udeb. +# i.e. convert possible given 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; diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 13feb25..5ce4304 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -1645,7 +1645,7 @@ void SymbianMakefileGenerator::writeSisxTargets(QTextStream &t) t << OK_SISX_TARGET ":" << endl; - QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(PLATFORM) $(TARGET) $(CERTIFICATE) $(KEY) $(PASSPHRASE)") + QString pkgcommand = QString("\tcreatepackage.bat %1_template.%2 $(TARGET) $(PLATFORM) $(CERTIFICATE) $(KEY) $(PASSPHRASE)") .arg(fileInfo(project->projectFile()).completeBaseName()) .arg("pkg"); t << pkgcommand << endl; -- cgit v0.12