diff -r 3ba40be8e484 -r 7ca52d38f8c3 secureswitools/swisistools/source/interpretsis/commandparser.cpp --- a/secureswitools/swisistools/source/interpretsis/commandparser.cpp Fri Mar 12 15:43:14 2010 +0200 +++ b/secureswitools/swisistools/source/interpretsis/commandparser.cpp Mon Mar 15 12:41:05 2010 +0200 @@ -161,6 +161,7 @@ << "\tdrive\t\tThe drive letter on the device\n" << "\tmcard\t\tOption to generate the stub SIS file for the installing package\n" << "\tmcardnr\t\tOption to generate the non-removable stub SIS file for the installing package\n" + << "\tnonremovablepkg\tOption to generate the non-removable SIS file for the installing package\n\n" << "\tmcardalone\tOption to just create a pre-installed package to the media card\n" << "\tmcardalonenr\tOption to generate the non-removable stub SIS file for the installing" << std::endl << "\t\t\tpackage without generating the SISregistry entry\n" @@ -169,7 +170,7 @@ void CCommandParser::DisplayVersion() { - std::cout << "\nINTERPRETSIS " << " Version 2.1.2 ." << std::endl; + std::cout << "\nINTERPRETSIS " << " Version 2.1.3 ." << std::endl; std::cout << "Copyright (c) 2009 Symbian Software Ltd. All rights reserved.\n " << std::endl; } @@ -543,7 +544,7 @@ else if (versionStr == "+MCARDNR") { sisFileName.iGenerateStub = true; - sisFileName.iNonRemovable = true; + sisFileName.iReadOnly = true; } else if (versionStr == "+MCARDALONE") { @@ -554,12 +555,16 @@ { sisFileName.iGenerateStub = true; sisFileName.iNotRegister = true; - sisFileName.iNonRemovable = true; + sisFileName.iReadOnly = true; } else if (versionStr == "+SUCERT") { sisFileName.iSUFlag = true; } + else if (versionStr == "+NONREMOVABLEPKG") + { + sisFileName.iNonRemovable = true; + } else throw CCommandParser::ECmdLineInvalidSISFileAttribute; }