| Line 859... |
Line 859... |
| 859 |
// copy over needed librarys
|
859 |
// copy over needed librarys
|
| 860 |
for ( CListNode<SNeededLibrary> *lNode = base->GetNeededLibraries()->Front(); lNode; lNode = lNode->next() )
|
860 |
for ( CListNode<SNeededLibrary> *lNode = base->GetNeededLibraries()->Front(); lNode; lNode = lNode->next() )
|
| 861 |
this->AddNeededLibrary(lNode->Data()->sName, lNode->Data()->sAuthor, lNode->Data()->sMinVersion);
|
861 |
this->AddNeededLibrary(lNode->Data()->sName, lNode->Data()->sAuthor, lNode->Data()->sMinVersion);
|
| 862 |
|
862 |
|
| 863 |
// web mirror address, add any new ones
|
863 |
// web mirror address, add any new ones
|
| 864 |
for(auto itr = base->getWebMirrors()->begin(); itr != base->getWebMirrors()->end(); itr++)
|
864 |
for(auto itr = base->webMirrors().begin(); itr != base->webMirrors().end(); itr++)
|
| 865 |
this->addWebMirror((*itr)->str);
|
865 |
this->addWebMirror((*itr)->str);
|
| 866 |
|
866 |
|
| 867 |
// copy over package names
|
867 |
// copy over package names
|
| 868 |
for ( CListNode<SNames>; *nNode = base->GetNamesList()->Front(); nNode; nNode = nNode->next() )
|
868 |
for(auto itr = base->;namesList()->begin(); itr != base->namesList()->end(); itr++)
|
| 869 |
this->AddLanguageName(nNode->Data()->iLanguage, nNode->Data()->sName);
|
869 |
this->addName((*itr)->iLanguage, (*itr)->sName);
|
| 870 |
|
870 |
|
| 871 |
// finally do all the files
|
871 |
// finally do all the files
|
| 872 |
for ( CListNode<C_File> *node = base->GetFileList()->Front(); node; node = node->next() )
|
872 |
for ( CListNode<C_File> *node = base->fileList().Front(); node; node = node->next() )
|
| 873 |
{
|
873 |
{
|
| 874 |
C_File *f = node->Data();
|
874 |
C_File *f = node->Data();
|
| 875 |
// if it exists, remove the old
|
875 |
// if it exists, remove the old
|
| 876 |
for ( CListNode<C_File> *thisNode = m_lFiles.Front(); thisNode; thisNode = thisNode->next() )
|
876 |
for ( CListNode<C_File> *thisNode = m_lFiles.Front(); thisNode; thisNode = thisNode->next() )
|
| 877 |
{
|
877 |
{
|
| Line 1102... |
Line 1102... |
| 1102 |
else if ( sCmd == "InstallBefore:" ) this->addInstallText(sRest.token(" ", 1).toLong(), true, sRest.tokens(" ", 2));
|
1102 |
else if ( sCmd == "InstallBefore:" ) this->addInstallText(sRest.token(" ", 1).toLong(), true, sRest.tokens(" ", 2));
|
| 1103 |
else if ( sCmd == "ScriptName:" )
|
1103 |
else if ( sCmd == "ScriptName:" )
|
| 1104 |
{
|
1104 |
{
|
| 1105 |
Utils::String lang = sRest.token(":", 1);
|
1105 |
Utils::String lang = sRest.token(":", 1);
|
| 1106 |
Utils::String name = sRest.tokens(":", 2);
|
1106 |
Utils::String name = sRest.tokens(":", 2);
|
| 1107 |
this->AddLanguageName(lang.toLong(), name);
|
1107 |
this->addName(lang.toLong(), name);
|
| 1108 |
CLog::logf(CLog::Log_EditPackage, 3, "\tScript Name Language (%s) %s", lang.c_str(), name.c_str() );
|
1108 |
CLog::logf(CLog::Log_EditPackage, 3, "\tScript Name Language (%s) %s", lang.c_str(), name.c_str() );
|
| 1109 |
}
|
1109 |
}
|
| 1110 |
}
|
1110 |
}
|
| 1111 |
|
1111 |
|
| 1112 |
Utils::String CSpkFile::_convert_parseFilename(const Utils::String &sRest, float fVersion, Utils::String *pDir)
|
1112 |
Utils::String CSpkFile::_convert_parseFilename(const Utils::String &sRest, float fVersion, Utils::String *pDir)
|
| Line 1281... |
Line 1281... |
| 1281 |
C_File *file = new C_File ();
|
1281 |
C_File *file = new C_File ();
|
| 1282 |
file->ReadFromData ( (char *)d, size );
|
1282 |
file->ReadFromData ( (char *)d, size );
|
| 1283 |
|
1283 |
|
| 1284 |
d += size;
|
1284 |
d += size;
|
| 1285 |
|
1285 |
|
| 1286 |
this->SetIcon(file, ext);
|
1286 |
this->setIcon(file, ext);
|
| 1287 |
|
1287 |
|
| 1288 |
CLog::logf(CLog::Log_File, 3, "\tIcon (%s) Size: %s", ext.c_str(), file->dataSizeString ().c_str() );
|
1288 |
CLog::logf(CLog::Log_File, 3, "\tIcon (%s) Size: %s", ext.c_str(), file->dataSizeString ().c_str() );
|
| 1289 |
}
|
1289 |
}
|
| 1290 |
else if ( sCmd.left(3) == "$$$" )
|
1290 |
else if ( sCmd.left(3) == "$$$" )
|
| 1291 |
d = _convert_parseFile(sCmd, sRest, fVersion, d);
|
1291 |
d = _convert_parseFile(sCmd, sRest, fVersion, d);
|