[ViewVC] Diff of: Oni2/AE/Installer/trunk/source/installer.cpp

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 516 by iritscen, Wed Apr 28 10:40:52 2010 UTC vs.
Revision 548 by gumby, Wed May 26 22:55:00 2010 UTC

+        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";
-+
-+
+        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);
+                        if ( is_directory( dir_itr->path() ) && 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")) {
+                                                        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" ;
->
+                                        }
+                        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;
+bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
-+
+        try {
+        fstream file;
+        string line;
+        vector<string> tokens, updateStarted;
+        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
->
+        //string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
+#else
+        FILE *fUserName = NULL;
+        char chrUserName[32];
+                        if (readingVerAndDate && tokens.capacity() >= 3)
+                                tokenize(tokens[2], updateStarted, "-");
-+
+#ifndef WIN32
+                if (updateStarted.capacity() < 3)
+                        needNewTrashDir = true;
+                else
+                        if (!exists(strTrashDir))
+                                needNewTrashDir = true;
-+
+#endif
+#ifndef WIN32
+        if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
+        if (exists(strPathToEUFN + 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);
+                if (exists(strPathToEUFN + strDaodan))
+                        if (exists(("../" + strDaodan)))
-<
+                                rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
->
+                                remove((path)("../" + strDaodan));
+                        rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
+                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);
+                        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 + "/";
+        for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
+                if (exists(strPathToPackages + strGlobalize + *iter))
-+
+#ifdef WIN32
-+
+                        remove((path)(strPathToPackages + strGlobalize + *iter));
-+
+#else
+                        rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
-+
+#endif
+                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((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" +
+        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)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing AE/Installer/trunk/source/installer.cpp (file contents): Revision 516 by iritscen, Wed Apr 28 10:40:52 2010 UTC vs. Revision 548 by gumby, Wed May 26 22:55:00 2010 UTC

Diff Legend

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 516 by iritscen, Wed Apr 28 10:40:52 2010 UTC vs.
Revision 548 by gumby, Wed May 26 22:55:00 2010 UTC