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 504 by gumby, Sat Mar 27 03:48:25 2010 UTC vs.
Revision 507 by gumby, Sat Apr 24 17:41:46 2010 UTC

#	Line 231 | Line 231 | int globalizeData(void)
231
232
233		if ( strcmp(levels[i].c_str(), "0") ){
234	<	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] + "_Final/AKEV/AKEV*.oni").c_str());
234	>	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] +
235	>	"_Final/AKEV/AKEV*.oni").c_str());
236		remove(  "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
237		}
238
#	Line 245 | Line 246 | int globalizeData(void)
246		for (int i = 0; i < 15; i++)
247		{
248		logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
249	<	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
249	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" +
250	>	levels[i] + "_Final.oni");
251		logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
252		+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
253		string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
#	Line 306 | Line 308 | int globalizeData(void)
308		/* On Mac only, set the current GDF to the AE GDF by writing to Oni's global preferences file (thankfully a standard OS X ".plist" XML file).
309		Tests for presence of prefs with [ -f ] before doing anything so it doesn't create a partial prefs file -- just in case user has never
310		run Oni before :-p */
311	<	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants the folder that *contains* the GDF)
311	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF)
312		//bad Iritscen, bad! fixed buffers can cause crashes.
313		/*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
314		strcat(prefsCommand, fullAEpath.c_str());
#	Line 349 | Line 351 | vector<ModPackage> getPackages(string pa
351
352		if (!file.fail())
353		{
354	<	package = fileToModPackage(file);
354	>	package = fileToModPackage(file, dir_itr->path().filename());
355		if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
356		{
357		#ifdef WIN32
#	Line 373 | Line 375 | vector<ModPackage> getPackages(string pa
375		return packages;
376		}
377
378	<	ModPackage fileToModPackage(fstream &file)
379	<	{
378	<	/*
379	<	This converts a file to a ModPackage struct.
380	<
381	<	A few notes...
382	<	"iter" is the current word we are on. I should have named it "token" or something, but I don't have multiple iterators, so its ok.
383	<	I refer to (*iter) at the beginning of each if statement block. I could probably store it as a variable, but I'm pretty sure that dereferencing a pointer\iterator isn't much
384	<	slower than reading a variable.
385	<	*/
378	>	ModPackage fileToModPackage(fstream &file, string modName)
379	>	{
380		ModPackage package;
381		string line;
382	<	static string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
383	<	static string NameOfMod = "NameOfMod";
384	<	static string ARROW = "->";
385	<	static string ModString = "ModString";
386	<	static string Platform = "Platform";
387	<	static string HasOnis = "HasOnis";
388	<	static string HasDeltas = "HasDeltas";
389	<	static string HasBSL = "HasBSL";
390	<	static string HasDats = "HasDats";
391	<	static string IsEngine = "IsEngine";
392	<	static string Readme = "Readme";
393	<	static string GlobalNeeded = "GlobalNeeded";
394	<	static string Category = "Category";
395	<	static string Creator = "Creator";
382	>	const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
383	>	const string NameOfMod = "NameOfMod";
384	>	const string ARROW = "->";
385	>	const string ModString = "ModString";
386	>	const string ModVersion = "ModVersion";
387	>	const string Platform = "Platform";
388	>	const string HasOnis = "HasOnis";
389	>	const string HasDeltas = "HasDeltas";
390	>	const string HasBSL = "HasBSL";
391	>	const string HasDats = "HasDats";
392	>	const string IsEngine = "IsEngine";
393	>	const string Readme = "Readme";
394	>	const string GlobalNeeded = "GlobalNeeded";
395	>	const string Category = "Category";
396	>	const string Creator = "Creator";
397	>	package.modStringName = modName;
398		while (!file.eof())
399		{
400		getline(file,line);
#	Line 425 | Line 421 | ModPackage fileToModPackage(fstream &fil
421		else if (!ModString.compare(*iter))
422		{
423		iter++; iter++;
424	<	package.modStringName = *iter;
424	>	//package.modStringName = *iter;
425		iter++;
426		package.modStringVersion = atof((*iter).c_str());
427		}
428	+	else if (!ModString.compare(*iter))
429	+	{
430	+	iter++; iter++;
431	+	package.modStringVersion = atof((*iter).c_str());
432	+	}
433		else if (!Platform.compare(*iter))
434		{
435		iter++; iter++;
#	Line 442 | Line 443 | ModPackage fileToModPackage(fstream &fil
443		else if (!HasBSL.compare(*iter))
444		{
445		iter++; iter++;
446	<	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
446	>	if (boost::iequals(*iter, "Yes")) package.hasBSL = true;
447		else if (boost::iequals(*iter, "Addon")) package.hasAddon = true;
448		}
449		else if (!HasDeltas.compare(*iter))
#	Line 567 | Line 568 | void recompileAll(vector<string> install
568
569
570		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
571	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
571	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
572	>	dir_itr->path().filename() + " ");
573
574		system(importCommand.c_str());
575		j++;
#	Line 623 | Line 625 | void recompileAll(vector<string> install
625		importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
626
627		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
628	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
628	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
629	>	dir_itr->path().filename() + " ");
630		system(importCommand.c_str());
631		j++;
632		}
#	Line 700 | Line 703 | void recompileAll(vector<string> install
703
704		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
705		{
706	<	ofstream BSLlog("BSL2.log", ios::app );
706	>	ofstream BSLlog("BSL.log", ios::app );
707
708		try {
709		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 808 | Line 811 | vector<string> getInstallString(string C
811		|                                                          Installer to be replaced (when the new Installer                     |
812		|                                                          launches, this function will be called again but will        |
813		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
814	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
815		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
816		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
817		{
#	Line 922 | Line 926 | int GetUpdateStatus(Install_info_cfg *cu
926		}
927		newUpdateLog << "Installer was updated to:\n";
928		newUpdateLog << newUpdateLine.c_str();
929	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
929	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
930		doneReadingFile = true;
931		newUpdateLog.close();
932		newUpdateLog.clear();
#	Line 961 | Line 965 | int GetUpdateStatus(Install_info_cfg *cu
965		return UPDATE_SIMP_AVAIL;
966		}
967		}
968	<	try {
965	<	directory_iterator end;
966	<	if(exists("../updates")){
967	<	for ( directory_iterator install_iter( "../updates" );
968	<	install_iter != end;
969	<	++install_iter )
968	>	try
969		{
970	<
971	<	ModPackage installedPackage, updatePackage;
972	<	if ( is_directory( install_iter->path() ) && exists( install_iter->path().string() + "/Mod_Info.cfg" ) ) {
973	<	fstream file;
975	<	file.open( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
976	<	if (!file.fail())
970	>	directory_iterator end;
971	>	if (exists("../updates"))
972	>	{
973	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
974		{
975	<	ModPackage updatePackage = fileToModPackage(file);
975	>	ModPackage installedPackage, updatePackage;
976	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
977	>	{
978	>	fstream file;
979	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
980	>	if (!file.fail())
981	>	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
982	>	else
983	>	{
984	>	file.close();
985	>	continue;
986	>	}
987	>	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
988	>	{
989	>	file.close();
990	>	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
991	>	if (!file.fail())
992	>	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
993	>	file.close();
994	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
995	>	{
996	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
997	>	return UPDATE_PKG_AVAIL;
998	>	}
999	>	}
1000	>	else
1001	>	{
1002	>	file.close();
1003	>	return UPDATE_PKG_AVAIL;
1004	>	}
1005	>	}
1006		}
1007		else
1008		{
1009		file.close();
1010		continue;
1011		}
985	–	if(!exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"));
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);
1017	>	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
1018		}
1019		else
1020		{
#	Line 995 | Line 1022 | int GetUpdateStatus(Install_info_cfg *cu
1022		return UPDATE_THIRD_PARTY;
1023		}
1024		file.close();
1025	<	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1025	>	if(((string)INSTALLER_VERSION).compare(updatePackage.installerVersion) < 1 && updatePackage.modStringVersion > installedPackage.modStringVersion) {
1026		return UPDATE_THIRD_PARTY;
1027		}
1001	–
1028		}
1003	–	}
1004	–
1005	–	}
1029		}
1030		catch (exception & ex) {
1031		//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1032		}
1010	–
1033
1034		return UPDATE_NO_UPD_AVAIL;
1035		}
#	Line 1234 | Line 1256 | bool ProcessInstallerUpdate(Install_info
1256
1257		string popenCommand = "../updates/" + strEUFN + "/install/";
1258		#ifdef WIN32
1237	–	// TODO: Fill in Windows equivalent of code below :-3
1259		popenCommand = "replace_installer.bat";
1260		#else
1261		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
#	Line 1264 | Line 1285 | bool ProcessInstallerUpdate(Install_info
1285		#endif
1286		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1287		}
1288	<	//strPathToEUFNPackages
1288	>
1289
1290		void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1291		try{
1292		directory_iterator end;
1293	<	for ( directory_iterator install_iter( pathToUpdate );
1294	<	install_iter != end;
1295	<	++install_iter )
1293	>	for ( directory_iterator update_iter( pathToUpdate );
1294	>	update_iter != end;
1295	>	++update_iter )
1296		{
1297
1298		ModPackage installedPackage, updatePackage;
1299	<	string updateStr = install_iter->path().string() + "/Mod_Info.cfg";
1300	<	if ( !boost::iequals(install_iter->path().filename(),"Edition")
1301	<	&& !boost::iequals(install_iter->path().filename(),"Edition-patch")
1302	<	&& is_directory( install_iter->path() )
1303	<	&& exists( install_iter->path().string() + "/Mod_Info.cfg" ) )
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( (install_iter->path().string() + "/Mod_Info.cfg").c_str());
1307	>	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1308		if (!file.fail())
1309		{
1310	<	updatePackage = fileToModPackage(file);
1310	>	updatePackage = fileToModPackage(file, update_iter->path().filename());
1311		}
1312		else
1313		{
1314		file.close();
1315		continue;
1316		}
1296	–	if(!exists(strPathToPackages + "/" + install_iter->path().filename() + "/Mod_Info.cfg"));
1317		file.close();
1318		file.clear();
1319	<	file.open((strPathToPackages + "/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
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);
1324	>	installedPackage = fileToModPackage(file, update_iter->path().filename());
1325		file.close();
1326		if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1305	–	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1327		update = 1;
1328		}
1329		}
#	Line 1312 | Line 1333 | void CrawlPackages(string pathToUpdate,
1333		update = 1;
1334		}
1335		file.close();
1336	<
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		}
#	Line 1360 | Line 1384 | bool ProcessAEUpdate(Install_info_cfg *c
1384		bool needNewTrashDir = false;
1385		bool readingVerAndDate = false;
1386
1363	–	// TODO: Fill in Windows equivalent of code below
1387		#ifdef WIN32
1388	<	string strTrashDir = "Trash\\";
1388	>	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1389		#else
1390		FILE *fUserName = NULL;
1391		char chrUserName[32];
#	Line 1499 | Line 1522 | bool ProcessAEUpdate(Install_info_cfg *c
1522		}
1523		}
1524
1525	<	CrawlPackages( strPathToEUFNPackages,  strPathToPackages);
1525	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1526
1527		// Next, we get a list of which files and folders in the update's Globalize folder to move over; all files not starting with '.' will be moved...
1528		// ...and folders which do not exist in the current AE will be created there
#	Line 1561 | Line 1584 | bool ProcessAEUpdate(Install_info_cfg *c
1584		return true;
1585		}
1586
1587	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1588	+	{
1589	+	ptime startTime(second_clock::local_time());
1590	+	#ifdef WIN32
1591	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1592	+	#else
1593	+	FILE *fUserName = NULL;
1594	+	char chrUserName[32];
1595	+	fUserName = popen("whoami", "r");
1596	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1597	+	pclose(fUserName);
1598	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1599	+	int endOfName = strUserName.find("\n", 0);
1600	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1601	+	bool needNewTrashDir = true;
1602	+	tm tmStartTime = to_tm(startTime);
1603	+	#endif
1604	+
1605	+	try
1606	+	{
1607	+	directory_iterator end;
1608	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1609	+	{
1610	+	ModPackage installedPackage, updatePackage;
1611	+	string updtPath = update_iter->path().string();
1612	+	string updtFolder = update_iter->path().filename();
1613	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1614	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1615	+	if (!boost::iequals(updtFolder, "Edition")
1616	+	&& !boost::iequals(updtFolder, "Edition-patch")
1617	+	&& is_directory(update_iter->path())
1618	+	&& exists(updtModInfo))
1619	+	{
1620	+	fstream file;
1621	+	file.open((updtModInfo).c_str());
1622	+	if (!file.fail())
1623	+	updatePackage = fileToModPackage(file, updtFolder);
1624	+	else
1625	+	{
1626	+	file.close();
1627	+	continue;
1628	+	}
1629	+	if (exists(instModInfo))
1630	+	{
1631	+	file.close();
1632	+	file.clear();
1633	+	file.open(instModInfo.c_str());
1634	+	if (!file.fail())
1635	+	{
1636	+	installedPackage = fileToModPackage(file, updtFolder);
1637	+	file.close();
1638	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1639	+	{
1640	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1641	+	{
1642	+	#ifdef WIN32
1643	+	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1644	+	#else
1645	+	if (needNewTrashDir)
1646	+	{
1647	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1648	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1649	+	create_directory(strTrashDir);
1650	+	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));
1655	+	}
1656	+	}
1657	+	}
1658	+	else
1659	+	file.close();
1660	+	}
1661	+	file.close();
1662	+	file.clear();
1663	+	}
1664	+	}
1665	+	}
1666	+	catch (exception & ex)
1667	+	{
1668	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1669	+	}
1670	+	}
1671	+
1672		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
1673		|  update's Globalize folder and changes its path, originally relative to the Installer, to be          |
1674		|  relative to the structure of the Globalize folder; this makes it easier to have the Installer        |

Diff Legend

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