65 Logger::SetLevel( options.WarningLevel() ); |
65 Logger::SetLevel( options.WarningLevel() ); |
66 |
66 |
67 CInterpretSIS interpretSis(paramList); |
67 CInterpretSIS interpretSis(paramList); |
68 |
68 |
69 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
69 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
70 if ( paramPtr->IsFlagSet(CParameterList::EFlagsResourceFilePathSet)) |
70 //Parsing Preprovisioned Resource file in not done if RegistryVersionExists |
|
71 if(!paramPtr->RegistryVersionExists()) |
71 { |
72 { |
72 ParseResourceDir(paramPtr, interpretSis); |
73 if ( paramPtr->IsFlagSet(CParameterList::EFlagsResourceFilePathSet)) |
|
74 { |
|
75 ParseResourceDir(paramPtr, interpretSis); |
73 |
76 |
74 if (NULL != logFile) |
77 if (NULL != logFile) |
|
78 { |
|
79 bool val = logFile->is_open(); |
|
80 logFile->close(); |
|
81 delete logFile; |
|
82 } |
|
83 return result; |
|
84 } |
|
85 else |
75 { |
86 { |
76 bool val = logFile->is_open(); |
87 ParseResourceDir(paramPtr, interpretSis); |
77 logFile->close(); |
|
78 delete logFile; |
|
79 } |
88 } |
80 return result; |
|
81 } |
|
82 else |
|
83 { |
|
84 ParseResourceDir(paramPtr, interpretSis); |
|
85 } |
89 } |
86 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
90 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
87 |
91 |
88 result = interpretSis.Install(); |
92 result = interpretSis.Install(); |
89 |
93 |
90 // Uninstall the sis files |
94 // Uninstall the sis files |
91 interpretSis.Uninstall(); |
95 interpretSis.Uninstall(); |
92 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
96 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
93 if(result != 0) |
97 if(result != 0) |
94 dbpath=GetDbPath(paramPtr); |
98 dbpath=GetDbPath(paramPtr); |