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 507 by gumby, Sat Apr 24 17:41:46 2010 UTC vs.
Revision 543 by gumby, Mon May 24 19:13:59 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 978 | Line 984 | int GetUpdateStatus(Install_info_cfg *cu
984		fstream file;
985		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
986		if (!file.fail())
987	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
987	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
988		else
989		{
990		file.close();
991		continue;
992		}
993	<	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
993	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
994		{
995		file.close();
996	<	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
996	>	file.clear();
997	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
998		if (!file.fail())
999	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
999	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1000		file.close();
1001		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1002		{
#	Line 1004 | Line 1011 | int GetUpdateStatus(Install_info_cfg *cu
1011		}
1012		}
1013		}
1007	–	else
1008	–	{
1009	–	file.close();
1010	–	continue;
1011	–	}
1012	–	file.close();
1013	–
1014	–	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1015	–	if (!file.fail())
1016	–	{
1017	–	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
1018	–	}
1019	–	else
1020	–	{
1021	–	file.close();
1022	–	return UPDATE_THIRD_PARTY;
1023	–	}
1024	–	file.close();
1025	–	if(((string)INSTALLER_VERSION).compare(updatePackage.installerVersion) < 1 && updatePackage.modStringVersion > installedPackage.modStringVersion) {
1026	–	return UPDATE_THIRD_PARTY;
1027	–	}
1014		}
1015		}
1016		catch (exception & ex) {
#	Line 1044 | Line 1030 | bool ReadInstallInfoCfg(fstream *fileHan
1030		string strDaodanVersion = "Daodan_Version";
1031		string strOniSplitVersion = "OniSplit_Version";
1032		string strGUIWinVersion = "GUI_Win_Version";
1033	<	string strGUIMacVersion = "GUI_Mac_Version";
1033	>	string strGUIMacVersion = "GUI_Mac_Version";
1034		string strReglobalize = "Reglobalize";
1035		string strDeleteList = "Delete_List";
1036		string strArrow = "->";
#	Line 1286 | Line 1272 | bool ProcessInstallerUpdate(Install_info
1272		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1273		}
1274
1289	–
1290	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1291	–	try{
1292	–	directory_iterator end;
1293	–	for ( directory_iterator update_iter( pathToUpdate );
1294	–	update_iter != end;
1295	–	++update_iter )
1296	–	{
1297	–
1298	–	ModPackage installedPackage, updatePackage;
1299	–	string updateStr = update_iter->path().string() + "/Mod_Info.cfg";
1300	–	if ( !boost::iequals(update_iter->path().filename(),"Edition")
1301	–	&& !boost::iequals(update_iter->path().filename(),"Edition-patch")
1302	–	&& is_directory( update_iter->path() )
1303	–	&& exists( update_iter->path().string() + "/Mod_Info.cfg" ) )
1304	–	{
1305	–	bool update = 0;
1306	–	fstream file;
1307	–	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1308	–	if (!file.fail())
1309	–	{
1310	–	updatePackage = fileToModPackage(file, update_iter->path().filename());
1311	–	}
1312	–	else
1313	–	{
1314	–	file.close();
1315	–	continue;
1316	–	}
1317	–	file.close();
1318	–	file.clear();
1319	–	if(exists(strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg"))
1320	–	{
1321	–	file.open((strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg").c_str());
1322	–	if (!file.fail())
1323	–	{
1324	–	installedPackage = fileToModPackage(file, update_iter->path().filename());
1325	–	file.close();
1326	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1327	–	update = 1;
1328	–	}
1329	–	}
1330	–	else
1331	–	{
1332	–	file.close();
1333	–	update = 1;
1334	–	}
1335	–	file.close();
1336	–	}
1337	–	else update = 1;
1338	–	if(update) {
1339	–	if(exists((path)(strPathToPackages +  "/" + updatePackage.modStringName)))
1340	–	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1341	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1342	–
1343	–	}
1344	–	}
1345	–	}
1346	–	}
1347	–	catch (exception & ex) {
1348	–	//      ex.what();
1349	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1350	–	}
1351	–	}
1352	–
1353	–
1354	–	bool ProcessThirdPartyUpdates() {
1355	–	CrawlPackages( "../updates",  "./packages");
1356	–	return true;
1357	–	//      globalPackages = getPackages();
1358	–	//      refreshMods(globalInstalledMods);
1359	–	}
1360	–
1361	–
1275		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1276		{
1277	+	try {
1278		fstream file;
1279		string line;
1280		vector<string> tokens, updateStarted;
#	Line 1380 | Line 1294 | bool ProcessAEUpdate(Install_info_cfg *c
1294		string strOniApp = "Oni.exe";
1295		#else
1296		string strOniApp = "Oni.app";
1383	–	#endif
1297		bool needNewTrashDir = false;
1298	+	#endif
1299	+
1300		bool readingVerAndDate = false;
1301
1302		#ifdef WIN32
1303	<	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1303	>	//string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1304		#else
1305		FILE *fUserName = NULL;
1306		char chrUserName[32];
#	Line 1420 | Line 1335 | bool ProcessAEUpdate(Install_info_cfg *c
1335		if (readingVerAndDate && tokens.capacity() >= 3)
1336		tokenize(tokens[2], updateStarted, "-");
1337		}
1338	+	#ifndef WIN32
1339		if (updateStarted.capacity() < 3)
1340		needNewTrashDir = true;
1341		else
#	Line 1429 | Line 1345 | bool ProcessAEUpdate(Install_info_cfg *c
1345		if (!exists(strTrashDir))
1346		needNewTrashDir = true;
1347		}
1348	+	#endif
1349		}
1350		#ifndef WIN32
1351		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1446 | Line 1363 | bool ProcessAEUpdate(Install_info_cfg *c
1363		if (exists(strPathToEUFN + strOniApp))
1364		{
1365		if (exists(strOniApp))
1366	+	#ifdef WIN32
1367	+	remove((path)strOniApp);
1368	+	#else
1369		rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1370	+	#endif
1371		rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1372		}
1373		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
#	Line 1454 | Line 1375 | bool ProcessAEUpdate(Install_info_cfg *c
1375		if (exists(strPathToEUFNInstall + strOniSplit))
1376		{
1377		if (exists(strOniSplit))
1378	+	#ifdef WIN32
1379	+	remove((path)strOniSplit);
1380	+	#else
1381		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1382	+	#endif
1383		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1384		}
1385		}
#	Line 1464 | Line 1389 | bool ProcessAEUpdate(Install_info_cfg *c
1389		if (exists(strPathToEUFN + strDaodan))
1390		{
1391		if (exists(("../" + strDaodan)))
1392	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1392	>	remove((path)("../" + strDaodan));
1393		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1394		}
1395		}
#	Line 1473 | Line 1398 | bool ProcessAEUpdate(Install_info_cfg *c
1398		if (exists(strPathToEUFNInstall + strWinGUI))
1399		{
1400		if (exists((path)strWinGUI))
1401	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1401	>	remove((path)strWinGUI);
1402		if (exists(strWinGUILang))
1403	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1403	>	remove((path)strWinGUILang);
1404		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1405		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1406		}
#	Line 1508 | Line 1433 | bool ProcessAEUpdate(Install_info_cfg *c
1433		while (curPos != string::npos && curPos < thePath.size())
1434		{
1435		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1436	+	#ifndef WIN32
1437		if (!exists(strTrashDir + aParentPath))
1438		create_directory(strTrashDir + aParentPath);
1439	+	#endif
1440		lastPos = curPos + 1;
1441		curPos = thePath.find("/", lastPos);
1442		aParentPath = aParentPath + "/";
#	Line 1554 | Line 1481 | bool ProcessAEUpdate(Install_info_cfg *c
1481		for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1482		{
1483		if (exists(strPathToPackages + strGlobalize + *iter))
1484	+	#ifdef WIN32
1485	+	remove((path)(strPathToPackages + strGlobalize + *iter));
1486	+	#else
1487		rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1488	+	#endif
1489		rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1490		}
1491
1492		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1493	+	#ifdef WIN32
1494	+	remove((path)strPathToEUFN);
1495	+	#else
1496		create_directory(strTrashDir + "Unneeded update files");
1497		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1498	<
1498	>	#endif
1499		// Write to log that we are finished with update
1500		ptime end_time(second_clock::local_time());
1501		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1579 | Line 1513 | bool ProcessAEUpdate(Install_info_cfg *c
1513		CheckForGlobalization(true); // the 'true' value forces re-globalization
1514
1515		globalPackages = getPackages(); // refresh the list in memory
1516	<	// TODO: Refresh the packages list in the window
1517	<
1516	>	wxCommandEvent e;
1517	>	TheWindow->OnRefreshButtonClick( e );
1518		return true;
1519	+	}
1520	+	catch (exception & ex)
1521	+	{
1522	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1523	+	return false;
1524	+	}
1525	+
1526		}
1527
1528		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
#	Line 1634 | Line 1575 | void ProcessPackageUpdates(string pathTo
1575		if (!file.fail())
1576		{
1577		installedPackage = fileToModPackage(file, updtFolder);
1578	<	file.close();
1579	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1580	<	{
1581	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1582	<	{
1578	>	}
1579	>	file.close();
1580	>	}
1581	>	file.close();
1582	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1583	>	{
1584	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1585	>	{
1586	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1587		#ifdef WIN32
1588	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1588	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1589		#else
1590	<	if (needNewTrashDir)
1591	<	{
1592	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1593	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1594	<	create_directory(strTrashDir);
1595	<	needNewTrashDir = false;
1651	<	}
1652	<	rename((path)(strPathToPackages +  "/" + installedPackage.modStringName), (path)(strTrashDir + installedPackage.modStringName));
1653	<	#endif
1654	<	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1590	>	if (needNewTrashDir)
1591	>	{
1592	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1593	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1594	>	create_directory(strTrashDir);
1595	>	needNewTrashDir = false;
1596		}
1597	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1598	+	#endif
1599		}
1600	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1601		}
1658	–	else
1659	–	file.close();
1602		}
1661	–	file.close();
1662	–	file.clear();
1603		}
1604		}
1605		}
#	Line 1667 | Line 1607 | void ProcessPackageUpdates(string pathTo
1607		{
1608		setStatusArea("Warning, handled exception: " + (string)ex.what());
1609		}
1610	+	wxCommandEvent e;
1611	+	TheWindow->OnRefreshButtonClick( e );
1612		}
1613
1614		/* 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)