ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/installer.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 509 by gumby, Sat Apr 24 19:19:14 2010 UTC vs.
Revision 542 by iritscen, Mon May 24 02:43:35 2010 UTC

# Line 27 | Line 27 | using namespace boost::posix_time;
27   // externs declared in installer.h
28   string strInstallCfg = "../GameDataFolder/Add.cfg";
29   string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
30 + extern MainWindow* TheWindow;
31  
32   int globalizeData(void)
33   {
# Line 734 | Line 735 | void copyBSL(string copypath, vector<str
735                                                          copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
736                                                  }
737                                          }
738 <                                        BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
739 <                                        BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
738 >                                        if( !pkg.hasAddon ) {
739 >                                                BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
740 >                                                BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
741 >                                        }
742                                  }
743                          }
744                  }
# Line 841 | Line 844 | int GetUpdateStatus(Install_info_cfg *cu
844                          return UPDATE_LOG_READ_ERR;
845          }
846  
847 <        // Is there an update folder, and is it a monthly release or a patch?
847 >        // Is there an update in the updates/ folder, and is it a monthly release or a patch?
848          bool firstParty = 0;
849 +        // First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
850 +        if (!exists("../updates"))
851 +                create_directory("../updates");
852          if (exists("../updates/Edition"))
853          {
854                  firstParty = 1;
# Line 975 | Line 981 | int GetUpdateStatus(Install_info_cfg *cu
981                                  ModPackage installedPackage, updatePackage;
982                                  if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
983                                  {
978 –                                        string blah =install_iter->path().string() + "/Mod_Info.cfg";
979 –                                        string blah2 = "packages/" + install_iter->path().filename() + "/Mod_Info.cfg";
984                                          fstream file;
985                                          file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
986                                          if (!file.fail())
# Line 1488 | Line 1492 | bool ProcessAEUpdate(Install_info_cfg *c
1492                  CheckForGlobalization(true); // the 'true' value forces re-globalization
1493          
1494          globalPackages = getPackages(); // refresh the list in memory
1495 <        // TODO: Refresh the packages list in the window
1496 <
1495 >        wxCommandEvent e;
1496 >        TheWindow->OnRefreshButtonClick( e );
1497          return true;
1498   }
1499 < extern MainWindow* TheWindow;
1499 >
1500   void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1501   {
1502          ptime startTime(second_clock::local_time());

Diff Legend

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