ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/installer.cpp

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 506 by iritscen, Mon Apr 5 02:11:45 2010 UTC vs.
Revision 526 by gumby, Sat May 22 22:07:58 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 978 | Line 981 | int GetUpdateStatus(Install_info_cfg *cu
981		fstream file;
982		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
983		if (!file.fail())
984	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
984	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
985		else
986		{
987		file.close();
988		continue;
989		}
990	<	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
990	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
991		{
992		file.close();
993	<	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
993	>	file.clear();
994	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
995		if (!file.fail())
996	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
996	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
997		file.close();
998		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
999		{
#	Line 1023 | Line 1027 | bool ReadInstallInfoCfg(fstream *fileHan
1027		string strDaodanVersion = "Daodan_Version";
1028		string strOniSplitVersion = "OniSplit_Version";
1029		string strGUIWinVersion = "GUI_Win_Version";
1030	<	string strGUIMacVersion = "GUI_Mac_Version";
1030	>	string strGUIMacVersion = "GUI_Mac_Version";
1031		string strReglobalize = "Reglobalize";
1032		string strDeleteList = "Delete_List";
1033		string strArrow = "->";
#	Line 1485 | Line 1489 | bool ProcessAEUpdate(Install_info_cfg *c
1489		CheckForGlobalization(true); // the 'true' value forces re-globalization
1490
1491		globalPackages = getPackages(); // refresh the list in memory
1492	<	// TODO: Refresh the packages list in the window
1493	<
1492	>	wxCommandEvent e;
1493	>	TheWindow->OnRefreshButtonClick( e );
1494		return true;
1495		}
1496
#	Line 1540 | Line 1544 | void ProcessPackageUpdates(string pathTo
1544		if (!file.fail())
1545		{
1546		installedPackage = fileToModPackage(file, updtFolder);
1547	<	file.close();
1548	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1549	<	{
1550	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1551	<	{
1547	>	}
1548	>	file.close();
1549	>	}
1550	>	file.close();
1551	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1552	>	{
1553	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1554	>	{
1555	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1556		#ifdef WIN32
1557	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1557	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1558		#else
1559	<	if (needNewTrashDir)
1560	<	{
1561	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1562	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1563	<	create_directory(strTrashDir);
1564	<	needNewTrashDir = false;
1557	<	}
1558	<	rename((path)(strPathToPackages +  "/" + installedPackage.modStringName), (path)(strTrashDir + installedPackage.modStringName));
1559	<	#endif
1560	<	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1559	>	if (needNewTrashDir)
1560	>	{
1561	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1562	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1563	>	create_directory(strTrashDir);
1564	>	needNewTrashDir = false;
1565		}
1566	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1567	+	#endif
1568		}
1569	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1570		}
1564	–	else
1565	–	file.close();
1571		}
1567	–	file.close();
1568	–	file.clear();
1572		}
1573		}
1574		}
#	Line 1573 | Line 1576 | void ProcessPackageUpdates(string pathTo
1576		{
1577		setStatusArea("Warning, handled exception: " + (string)ex.what());
1578		}
1579	+	wxCommandEvent e;
1580	+	TheWindow->OnRefreshButtonClick( e );
1581		}
1582
1583		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \

Diff Legend

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