122 KDriveC), |
122 KDriveC), |
123 iVendorLocalizedName(new std::wstring(aSis.GetVendorLocalName())),iConfigManager(aConfigManager) |
123 iVendorLocalizedName(new std::wstring(aSis.GetVendorLocalName())),iConfigManager(aConfigManager) |
124 { |
124 { |
125 for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
125 for( InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
126 { |
126 { |
127 InstallableFile* installableFile= *curr; |
127 InstallableFile* installableFile= *curr; |
128 #ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
129 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget()); |
128 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget()); |
130 #else |
|
131 FileDescription* f = new FileDescription(*installableFile->FileDescription() , installableFile->Sid(), aTargetDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
|
132 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
133 iFileDescriptions.push_back(f); |
129 iFileDescriptions.push_back(f); |
134 } |
130 } |
135 |
131 |
136 iTrustStatus = new TrustStatus(); |
132 iTrustStatus = new TrustStatus(); |
137 TUint64 x = 0; |
133 TUint64 x = 0; |
382 if(aSid) |
378 if(aSid) |
383 { |
379 { |
384 aSids.push_back(aSid); |
380 aSids.push_back(aSid); |
385 } |
381 } |
386 } |
382 } |
387 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK //Just to ignore compiler |
383 |
388 FileDescription* aFileDescription = new FileDescription(fileDesc, aSid, L'Z', fileDesc.Target().GetString(), fileDesc.Target().GetString()); |
|
389 #else |
|
390 FileDescription* aFileDescription = new FileDescription(fileDesc, aSid, L'Z', fileDesc.Target().GetString()); |
384 FileDescription* aFileDescription = new FileDescription(fileDesc, aSid, L'Z', fileDesc.Target().GetString()); |
391 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
392 iFileDescriptions.push_back(aFileDescription); |
385 iFileDescriptions.push_back(aFileDescription); |
393 } |
386 } |
394 SetSids(aSids); |
387 SetSids(aSids); |
395 |
388 |
396 // Dependencies |
389 // Dependencies |
729 { |
722 { |
730 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
723 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
731 { |
724 { |
732 InstallableFile* installableFile= *curr; |
725 InstallableFile* installableFile= *curr; |
733 TUint32 sid = installableFile->Sid(); |
726 TUint32 sid = installableFile->Sid(); |
734 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
735 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
|
736 #else |
|
737 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
727 FileDescription* f = new FileDescription(*installableFile->FileDescription() , sid, iSelectedDrive, installableFile->GetTarget()); |
738 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
739 iFileDescriptions.push_back(f); |
728 iFileDescriptions.push_back(f); |
740 |
729 |
741 // If the SID is there already there is no reason to add it again |
730 // If the SID is there already there is no reason to add it again |
742 if (installableFile->IsExe()) |
731 if (installableFile->IsExe()) |
743 { |
732 { |
754 // Check the new files to determine which files we need to remove prior to installing them |
743 // Check the new files to determine which files we need to remove prior to installing them |
755 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
744 for(InstallableFiles::const_iterator curr = aFiles.begin(); curr != aFiles.end(); ++curr ) |
756 { |
745 { |
757 InstallableFile* installableFile= *curr; |
746 InstallableFile* installableFile= *curr; |
758 TUint32 sid = installableFile->Sid(); |
747 TUint32 sid = installableFile->Sid(); |
759 #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
760 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
748 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
761 iSelectedDrive, installableFile->GetTarget(),installableFile->GetLocalTarget()); |
749 iSelectedDrive, installableFile->GetTarget()); |
762 #else |
|
763 FileDescription f = FileDescription(*installableFile->FileDescription(), sid, |
|
764 iSelectedDrive, installableFile->GetTarget()); |
|
765 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK |
|
766 |
750 |
767 FileDescriptions::const_iterator end = iFileDescriptions.end(); |
751 FileDescriptions::const_iterator end = iFileDescriptions.end(); |
768 for (FileDescriptions::iterator curr2 = iFileDescriptions.begin(); |
752 for (FileDescriptions::iterator curr2 = iFileDescriptions.begin(); |
769 curr2 != end; ++curr2) |
753 curr2 != end; ++curr2) |
770 { |
754 { |