--- AE/Installer/trunk/source/installer.cpp 2010/04/28 10:40:52 516 +++ AE/Installer/trunk/source/installer.cpp 2010/05/30 01:58:25 559 @@ -310,11 +310,6 @@ int globalizeData(void) Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never run Oni before :-p */ string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF) - //bad Iritscen, bad! fixed buffers can cause crashes. - /*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"; - strcat(prefsCommand, fullAEpath.c_str()); - strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters - */ string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '" + fullAEpath + "'"; system(prefsCommand.c_str()); @@ -426,7 +421,7 @@ ModPackage fileToModPackage(fstream &fil iter++; package.modStringVersion = atof((*iter).c_str()); } - else if (!ModString.compare(*iter)) + else if (!ModVersion.compare(*iter)) { iter++; iter++; package.modStringVersion = atof((*iter).c_str()); @@ -597,37 +592,53 @@ void recompileAll(vector install else if(splitInstances == false){ directory_iterator end_iter; - for ( directory_iterator dir_itr( vanilla_dir ); - dir_itr != end_iter; - ++dir_itr ) - { - if ( is_directory( dir_itr->status() ) ) - { - numberOfDats++; + + char levelnums[256] = {0}; + + + + for(int k = 0; k < 256; k++) { + if( exists( (path)("./VanillaDats/level" + lexical_cast(k) + "_final/") ) ) { + levelnums[k] = 1; + } } - + + for (int i = installedMods.size() - 1; i >= 0; i--) { //Iterates through the installed mods (backwards :P) + for (unsigned int j = 0; j < globalPackages.size(); ++j) { //looking in the global packages + if (globalPackages[j].modStringName == installedMods[i]) { //for a mod that has BSL in it + for(int k = 0; k < 256; k++) { + if( globalPackages[j].hasOnis && + exists( (path)("packages/" + globalPackages[j].modStringName + "/oni/level" + lexical_cast(k) + "_final/") ) ) { + levelnums[k] = 1; + + } + } + } + } + } + for (int levelnum = 0; levelnum < 256; levelnum++) + if (levelnums[levelnum]) + numberOfDats++; + out << numberOfDats; datString = out.str(); - - for ( directory_iterator dir_itr( vanilla_dir ); - dir_itr != end_iter; - ++dir_itr ) - { + + for(int levelnum = 0; levelnum < 256; levelnum++) { try { - if ( is_directory( dir_itr->status() ) ) + if ( levelnums[levelnum] ) { - importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " "; + importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + "level" + lexical_cast(levelnum) + "_Final "; for (unsigned int i = 0; i < installedMods.size(); ++i) { - if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename() )) - importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename(); + if (exists((path)("packages/" + installedMods[i] + "/oni/level" + lexical_cast(levelnum) + "_final") )) + importCommand += " packages/" + installedMods[i] + "/oni/level" + lexical_cast(levelnum) + "_Final"; } - importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log"; + importCommand += " ../GameDataFolder/level" + lexical_cast(levelnum) + "_Final.dat >> Install.log"; setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats setStatusArea("Step " + lexical_cast(j) + '/' + lexical_cast(numberOfDats)+ ": Importing " + - dir_itr->path().filename() + " "); + "level" + lexical_cast(levelnum) + "_Final"+ " "); system(importCommand.c_str()); j++; } @@ -647,6 +658,11 @@ void recompileAll(vector install vector skippedfolders; ofstream BSLlog("BSL.log"); + if(!exists("../GameDataFolder/BSLBackup/")) { + create_directory("../GameDataFolder/BSLBackup/"); + copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/"); + } + for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr; dir_itr != end_itr; ++dir_itr ) { @@ -659,7 +675,7 @@ void recompileAll(vector install for (int i = installedMods.size() - 1; i >= 0; i--) { //Iterates through the installed mods (backwards :P) for (unsigned int j = 0; j < globalPackages.size(); ++j) { //looking in the global packages if (globalPackages[j].modStringName == installedMods[i]) { //for a mod that has BSL in it - if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL + if(globalPackages[j].hasBSL) break; //skip non-BSL if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) { copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] ); BSLlog << "Copied " << globalPackages[j].modStringName << "!\n"; @@ -668,12 +684,26 @@ void recompileAll(vector install } } + + ModPackage emptyPackage; emptyPackage.modStringName = "VanillaBSL"; emptyPackage.hasBSL = 1; copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage); BSLlog.close(); - + + for (int i = installedMods.size() - 1; i >= 0; i--) { //Iterates through the installed mods (backwards :P) + for (unsigned int j = 0; j < globalPackages.size(); ++j) { //looking in the global packages + if (globalPackages[j].modStringName == installedMods[i]) { //for a mod that has BSL in it + if(!globalPackages[j].hasAddon) break; //skip non-BSL + if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) { + copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] ); + BSLlog << "Copied " << globalPackages[j].modStringName << "!\n"; + } + } + } + } + logfile << "Writing config file"; writeInstalledMods(installedMods); setProgressBar(1000); @@ -714,17 +744,18 @@ void copyBSL(string copypath, vectorpath() ) && dir_itr->path().string() != ".svn" ) { BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n"; int skip_folder = 0; - - for(unsigned int k = 0; k < BSLfolders.size(); k++) {//iterate through already found BSL folders - BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n"; - if(dir_itr->path().filename() == BSLfolders[k]) { - skip_folder = 1; - BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n"; - break; + if(!pkg.hasAddon) { + for(unsigned int k = 0; k < BSLfolders.size(); k++) {//iterate through already found BSL folders + BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n"; + if(dir_itr->path().filename() == BSLfolders[k]) { + skip_folder = 1; + BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n"; + break; + } } } if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) { - remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() ); + if(!pkg.hasAddon) remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() ); Sleep(100); create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename()); BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n"; @@ -732,11 +763,15 @@ void copyBSL(string copypath, vectorpath().extension() == ".bsl" ) { + if(exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename())) + remove("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()); copy_file(bsl_itr->path(), "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()); } } - BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon - BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ; + if( !pkg.hasAddon ) { + BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon + BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ; + } } } } @@ -842,8 +877,11 @@ int GetUpdateStatus(Install_info_cfg *cu return UPDATE_LOG_READ_ERR; } - // Is there an update folder, and is it a monthly release or a patch? + // Is there an update in the updates/ folder, and is it a monthly release or a patch? bool firstParty = 0; + // First create the folder if it's missing, so users are never left wondering where updates are supposed to be put + if (!exists("../updates")) + create_directory("../updates"); if (exists("../updates/Edition")) { firstParty = 1; @@ -946,13 +984,8 @@ int GetUpdateStatus(Install_info_cfg *cu return UPDATE_LOG_READ_ERR; } - if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed? + if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed? { - if (!strEUFN.compare("Edition-patch")) // if update is a patch... - { - if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month? - return UPDATE_MNTH_REQD_ERR; - } string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName; string installerVersion = INSTALLER_VERSION; if (updateAE->InstallerVersion.compare(installerVersion) >= 1) @@ -965,6 +998,8 @@ int GetUpdateStatus(Install_info_cfg *cu else return UPDATE_SIMP_AVAIL; } + else + return UPDATE_MNTH_REQD_ERR; } try { @@ -1269,6 +1304,7 @@ bool ProcessInstallerUpdate(Install_info bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated) { + try { fstream file; string line; vector tokens, updateStarted; @@ -1288,12 +1324,18 @@ bool ProcessAEUpdate(Install_info_cfg *c string strOniApp = "Oni.exe"; #else string strOniApp = "Oni.app"; -#endif bool needNewTrashDir = false; +#endif + bool readingVerAndDate = false; #ifdef WIN32 - string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted + //remove readonly attrib from files. + setStatusArea("Removing readonly attribute..."); + system("attrib -r ./* /s"); + system("attrib -r ../Oni.exe /s"); + system("attrib -r ../binkw32.dll /s"); + #else FILE *fUserName = NULL; char chrUserName[32]; @@ -1328,6 +1370,7 @@ bool ProcessAEUpdate(Install_info_cfg *c if (readingVerAndDate && tokens.capacity() >= 3) tokenize(tokens[2], updateStarted, "-"); } +#ifndef WIN32 if (updateStarted.capacity() < 3) needNewTrashDir = true; else @@ -1337,6 +1380,7 @@ bool ProcessAEUpdate(Install_info_cfg *c if (!exists(strTrashDir)) needNewTrashDir = true; } +#endif } #ifndef WIN32 if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to @@ -1353,16 +1397,24 @@ bool ProcessAEUpdate(Install_info_cfg *c // Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit if (exists(strPathToEUFN + strOniApp)) { - if (exists(strOniApp)) - rename((path)strOniApp, (path)(strTrashDir + strOniApp)); - rename((path)(strPathToEUFN + strOniApp), (path)strOniApp); + if (exists("../" + strOniApp)) +#ifdef WIN32 + remove((path)("../" + strOniApp)); +#else + rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp)); +#endif + rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp)); } if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1) { if (exists(strPathToEUFNInstall + strOniSplit)) { if (exists(strOniSplit)) +#ifdef WIN32 + remove((path)strOniSplit); +#else rename((path)strOniSplit, (path)(strTrashDir + strOniSplit)); +#endif rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit); } } @@ -1372,7 +1424,7 @@ bool ProcessAEUpdate(Install_info_cfg *c if (exists(strPathToEUFN + strDaodan)) { if (exists(("../" + strDaodan))) - rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan)); + remove((path)("../" + strDaodan)); rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan)); } } @@ -1381,9 +1433,9 @@ bool ProcessAEUpdate(Install_info_cfg *c if (exists(strPathToEUFNInstall + strWinGUI)) { if (exists((path)strWinGUI)) - rename((path)strWinGUI, (path)(strTrashDir + strWinGUI)); + remove((path)strWinGUI); if (exists(strWinGUILang)) - rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang)); + remove((path)strWinGUILang); rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI); rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang); } @@ -1416,8 +1468,10 @@ bool ProcessAEUpdate(Install_info_cfg *c while (curPos != string::npos && curPos < thePath.size()) { aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos); +#ifndef WIN32 if (!exists(strTrashDir + aParentPath)) create_directory(strTrashDir + aParentPath); +#endif lastPos = curPos + 1; curPos = thePath.find("/", lastPos); aParentPath = aParentPath + "/"; @@ -1432,44 +1486,48 @@ bool ProcessAEUpdate(Install_info_cfg *c ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages); - // Next, we get a list of which files and folders in the update's Globalize folder to move over; all files not starting with '.' will be moved... - // ...and folders which do not exist in the current AE will be created there - vector foldersToMake, filesToMove; - string thePath; + // Next, move over files in the update's Globalize folder; subfolders which do not exist in the current AE will be created by Boost's... + // ...create_directories() function + string strPath; + path thePath; for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr) { - thePath = dir_itr->path().string(); - MakePathLocalToGlobalize(&thePath); + strPath = dir_itr->path().string(); + MakePathLocalToGlobalize(&strPath); + thePath = (path)strPath; if (is_regular_file(dir_itr->status())) { - if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix - filesToMove.push_back(thePath); - } - else if (is_directory(dir_itr->status())) - { - if (!exists(strPathToPackages + strGlobalize + thePath)) - foldersToMake.push_back(thePath); + if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix + { + if (exists(strPathToPackages + strGlobalize + strPath)) + { +#ifdef WIN32 + remove((path)(strPathToPackages + strGlobalize + strPath)); +#else + create_directories((path)(strTrashDir + thePath.parent_path().string())); + rename((path)(strPathToPackages + strGlobalize + strPath), (path)(strTrashDir + strPath)); +#endif + rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath)); + } + else + { + int slashLoc = 0; + slashLoc = strPath.find("/", 0); + if (slashLoc != string::npos) // then path contains slashes, so we need to make sure its parents' paths exist before moving it + create_directories((path)(strPathToPackages + strGlobalize + thePath.parent_path().string())); + rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath)); + } + } } } - // Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'... - // ...before folder 'parent/child/'"? - sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file - // First make the folders that don't exist in the current AE, so all the files have a place to go - for (vector::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++) - { - create_directory(strPathToPackages + strGlobalize + *iter); - } - for (vector::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++) - { - if (exists(strPathToPackages + strGlobalize + *iter)) - rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter)); - rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter)); - } // Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE +#ifdef WIN32 + remove_all((path)strPathToEUFN); +#else create_directory(strTrashDir + "Unneeded update files"); rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN)); - +#endif // Write to log that we are finished with update ptime end_time(second_clock::local_time()); string progressMsg2 = "Edition was updated to:\n" + @@ -1490,6 +1548,12 @@ bool ProcessAEUpdate(Install_info_cfg *c wxCommandEvent e; TheWindow->OnRefreshButtonClick( e ); return true; + } + catch (exception & ex) + { + setStatusArea("Warning, handled exception: " + (string)ex.what()); + return false; + } } void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages) @@ -1674,23 +1738,23 @@ void copy( const path & from_ph, } else if(from_ph.filename() != ".svn") - { - path destination; - if(!exists(to_ph)) - { - destination=to_ph; - } - else - { - destination=to_ph/from_ph.filename(); - } + { + path destination; + if(!exists(to_ph)) + { + destination=to_ph; + } + else + { + destination=to_ph/from_ph.filename(); + } - for(directory_iterator i(from_ph); i!=directory_iterator(); ++i) + for(directory_iterator i(from_ph); i!=directory_iterator(); ++i) { //the idiot who coded this in the first place (not me) //forgot to make a new directory. Exception city. x_x - create_directory(destination); - copy(*i,destination/i->filename()); + create_directory(destination); + copy(*i, destination/i->filename()); } } }