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 508 by gumby, Sat Apr 24 17:52:34 2010 UTC vs.
Revision 516 by iritscen, Wed Apr 28 10:40:52 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 978 | Line 979 | int GetUpdateStatus(Install_info_cfg *cu
979		fstream file;
980		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
981		if (!file.fail())
982	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
982	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
983		else
984		{
985		file.close();
986		continue;
987		}
988	<	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
988	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
989		{
990		file.close();
991	<	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
991	>	file.clear();
992	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
993		if (!file.fail())
994	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
994	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
995		file.close();
996		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
997		{
#	Line 1485 | Line 1487 | bool ProcessAEUpdate(Install_info_cfg *c
1487		CheckForGlobalization(true); // the 'true' value forces re-globalization
1488
1489		globalPackages = getPackages(); // refresh the list in memory
1490	<	// TODO: Refresh the packages list in the window
1491	<
1490	>	wxCommandEvent e;
1491	>	TheWindow->OnRefreshButtonClick( e );
1492		return true;
1493		}
1494
#	Line 1540 | Line 1542 | void ProcessPackageUpdates(string pathTo
1542		if (!file.fail())
1543		{
1544		installedPackage = fileToModPackage(file, updtFolder);
1545	<	file.close();
1546	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1547	<	{
1548	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1549	<	{
1545	>	}
1546	>	file.close();
1547	>	}
1548	>	file.close();
1549	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1550	>	{
1551	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1552	>	{
1553	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1554		#ifdef WIN32
1555	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1555	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1556		#else
1557	<	if (needNewTrashDir)
1558	<	{
1559	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1560	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1561	<	create_directory(strTrashDir);
1562	<	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));
1557	>	if (needNewTrashDir)
1558	>	{
1559	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1560	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1561	>	create_directory(strTrashDir);
1562	>	needNewTrashDir = false;
1563		}
1564	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1565	+	#endif
1566		}
1567	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1568		}
1564	–	else
1565	–	file.close();
1569		}
1567	–	file.close();
1568	–	file.clear();
1570		}
1571		}
1572		}
#	Line 1573 | Line 1574 | void ProcessPackageUpdates(string pathTo
1574		{
1575		setStatusArea("Warning, handled exception: " + (string)ex.what());
1576		}
1577	+	wxCommandEvent e;
1578	+	TheWindow->OnRefreshButtonClick( e );
1579		}
1580
1581		/* 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)