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 489 by gumby, Sun Jan 24 23:58:16 2010 UTC vs.
Revision 558 by gumby, Sat May 29 19:21:27 2010 UTC

#	Line 17 | Line 17
17		#include "boost/date_time/gregorian/gregorian.hpp"
18		#include "boost/date_time/date_parsing.hpp"
19		#include "boost/date_time/posix_time/posix_time.hpp"
20	+	#include <boost/algorithm/string.hpp>
21		#include "installer.h"
22		#include "aeinstallerapp.h"
23
#	Line 26 | 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 230 | Line 232 | int globalizeData(void)
232
233
234		if ( strcmp(levels[i].c_str(), "0") ){
235	<	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] + "_Final/AKEV/AKEV*.oni").c_str());
235	>	system((strOniSplit + " -move:overwrite ../GameDataFolder/level" + levels[i] + "_Final ../GameDataFolder/level" + levels[i] +
236	>	"_Final/AKEV/AKEV*.oni").c_str());
237		remove(  "../GameDataFolder/level" + levels[i] + "_Final/AKEV" );
238		}
239
#	Line 244 | Line 247 | int globalizeData(void)
247		for (int i = 0; i < 15; i++)
248		{
249		logfile << "\tReimporting level" << levels[i] << "_Final.oni\n";
250	<	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" + levels[i]+"_Final.oni");
250	>	setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + " reimporting level" +
251	>	levels[i] + "_Final.oni");
252		logfile << (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
253		+ levels[i] + "_Final/level" + levels[i] + "_Final.oni >> Globalize.log").c_str() << '\n';
254		string sys_str = (strOniSplit + " " + strImportOption + " ../GameDataFolder/level" + levels[i] + "_Final VanillaDats/level" + levels[i] + "_Final/level"
#	Line 269 | Line 273 | int globalizeData(void)
273		setStatusArea("Step " + lexical_cast<std::string>(parts_done + 1) + "/" + lexical_cast<std::string>(total_steps) + ": moving level0_Characters" );
274		copy((path)"../GameDataFolder/level0_Characters", (path)("VanillaDats/level0_Final"));
275		GDFPaths.push_back( Characters );
276	+	//concactates level0....
277		for(int i = 0; i < GDFPaths.size(); i++)
278		{
279		directory_iterator end_iter;
#	Line 283 | Line 288 | int globalizeData(void)
288		}
289		}
290		}
291	+	//?: syntax is fun.
292	+	//condition ? value_if_true : value_if_false
293	+	(is_empty(Characters)   ? remove( Characters )  : 1);
294	+	(is_empty(Particles)    ? remove( Particles )   : 1);
295	+	(is_empty(Textures)             ? remove( Textures )    : 1);
296	+	(is_empty(Sounds)               ? remove( Sounds )              : 1);
297	+	(is_empty(TRAC)                 ? remove( TRAC )                : 1);
298	+	(is_empty(TRAM)                 ? remove( TRAM )                : 1);
299	+	(is_empty(Animations)   ? remove( Animations )  : 1);
300
301		create_directory((path)"../GameDataFolder/IGMD");
302		copy((path)"packages/VanillaBSL/IGMD", (path)"../GameDataFolder");
303		setProgressBar( 1000 );
304	<
305	<	if(exists("../../persist.dat"))
306	<	if(!exists("../persist.dat"))
307	<
294	<	//TODO: Concatenate level0 Dirs.
295	<
296	<	copy("../../persist.dat","..");
297	<	if(exists("../../key_config.txt"))
298	<	if(!exists("../key_config.txt"))
299	<	copy("../../key_config.txt","..");
300	<
304	>
305	>	if(exists("../../persist.dat") && !exists("../persist.dat")) copy("../../persist.dat","..");
306	>	if(exists("../../key_config.txt")&& !exists("../key_config.txt")) copy("../../key_config.txt","..");
307	>
308		#ifndef WIN32
309		/* 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).
310		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
311		run Oni before :-p */
312	<	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for edition/
313	<	char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
314	<	strcat(prefsCommand, fullAEpath.c_str()); // get path of Edition/ folder (Oni wants the folder that *contains* the GDF)
315	<	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
316	<	system(prefsCommand);
312	>	string fullAEpath = escapePath(system_complete(".").parent_path().parent_path().string()); // get full path for Edition/ (Oni wants folder that *contains* the GDF)
313	>	string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"
314	>	+ fullAEpath + "'";
315	>	system(prefsCommand.c_str());
316	>
317		#endif
318
319		setStatusArea((string)"Done! Now select your mod packages and click install.");
#	Line 326 | Line 333 | int globalizeData(void)
333		vector<ModPackage> getPackages(string packageDir)
334		{
335		vector<ModPackage> packages;
336	+	ModPackage package;
337		packages.reserve(256);
338		fstream file;
339		string filename = "\0";
#	Line 337 | Line 345 | vector<ModPackage> getPackages(string pa
345		{
346		file.open((dir_itr->path().string() + "/" + MODINFO_CFG).c_str());
347
348	<	if(!file.fail())
348	>	if (!file.fail())
349		{
350	<	//would prefer to push a pointer to a package, but this will do for now
351	<	packages.push_back(fileToModPackage(file));
350	>	package = fileToModPackage(file, dir_itr->path().filename());
351	>	if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
352	>	{
353	>	#ifdef WIN32
354	>	if (!package.platform.compare("Windows") || !package.platform.compare("Both")) // don't show package if it's not for the right OS
355	>	#else
356	>	if (!package.platform.compare("Macintosh") || !package.platform.compare("Both"))
357	>	#endif
358	>	packages.push_back(package);
359	>	}
360		}
361		file.close();
362		file.clear();
#	Line 355 | Line 371 | vector<ModPackage> getPackages(string pa
371		return packages;
372		}
373
374	<	ModPackage fileToModPackage(fstream &file)
375	<	{
360	<	/*
361	<	This converts a file to a ModPackage struct.
362	<
363	<	A few notes...
364	<	"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.
365	<	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
366	<	slower than reading a variable.
367	<	*/
374	>	ModPackage fileToModPackage(fstream &file, string modName)
375	>	{
376		ModPackage package;
377		string line;
378	<	static string NameOfMod = "NameOfMod";  //used for comparing to the current token...
379	<	//I could have done it in reverse (*iter).compare("ModString") or
380	<	static string ARROW = "->";                             //did something like "ModString".compare(*iter), and it would have been
381	<	static string ModString = "ModString";  //functionably the same.
382	<	static string HasOnis = "HasOnis";
383	<	static string HasDeltas = "HasDeltas";
384	<	static string HasBSL = "HasBSL";
385	<	static string HasDats = "HasDats";
386	<	static string IsEngine = "IsEngine";
387	<	static string Readme = "Readme";
388	<	static string GlobalNeeded = "GlobalNeeded";
389	<	static string Category = "Category";
390	<	static string Creator = "Creator";
391	<	while (! file.eof() )
378	>	const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
379	>	const string NameOfMod = "NameOfMod";
380	>	const string ARROW = "->";
381	>	const string ModString = "ModString";
382	>	const string ModVersion = "ModVersion";
383	>	const string Platform = "Platform";
384	>	const string HasOnis = "HasOnis";
385	>	const string HasDeltas = "HasDeltas";
386	>	const string HasBSL = "HasBSL";
387	>	const string HasDats = "HasDats";
388	>	const string IsEngine = "IsEngine";
389	>	const string Readme = "Readme";
390	>	const string GlobalNeeded = "GlobalNeeded";
391	>	const string Category = "Category";
392	>	const string Creator = "Creator";
393	>	package.modStringName = modName;
394	>	while (!file.eof())
395		{
396	<	getline (file,line);
396	>	getline(file,line);
397		vector<string> tokens;
398		vector<string>::iterator iter;
399	<	tokenize(line, tokens);                                 //string to vector of "words"
400	<	if (tokens.capacity() >= 3) {                   //make sure they are using enough stuff
401	<	iter = tokens.begin();                          //what word we are on, starts at first word
402	<	/* TODO: Get this "required Installer version" code working
403	<	if (!AEInstallVersion.compare(*iter))
404	<	If mod is too old, skip this mod.
405	<	*/
406	<	/*else*/if (!NameOfMod.compare(*iter))  {       //if it contains the name
407	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches the end of the line or a "//" comment
408	<	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) {                 // ignores "->" and "NameOfMod"
399	>	tokenize(line, tokens);
400	>	if (tokens.capacity() >= 3)
401	>	{
402	>	iter = tokens.begin();
403	>
404	>	if (!AEInstallVersion.compare(*iter))
405	>	{
406	>	iter++; iter++;
407	>	package.installerVersion = *iter;
408	>	}
409	>	else if (!NameOfMod.compare(*iter))
410	>	{
411	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) // iterates through the words, ends if it reaches the end of the line or a "//" comment
412	>	{
413	>	if (ARROW.compare(*iter) && NameOfMod.compare(*iter)) // ignores "->" and "NameOfMod"
414		package.name += *iter + " ";
399	–	}
415		}
401	–
416		}
417	<	else if (!ModString.compare(*iter)) {
417	>	else if (!ModString.compare(*iter))
418	>	{
419		iter++; iter++;
420	<	package.modStringName = *iter;
420	>	//package.modStringName = *iter;
421		iter++;
422	<	package.modStringVersion = atoi((*iter).c_str());
422	>	package.modStringVersion = atof((*iter).c_str());
423		}
424	<	else if (!HasOnis.compare(*iter)) {
424	>	else if (!ModVersion.compare(*iter))
425	>	{
426	>	iter++; iter++;
427	>	package.modStringVersion = atof((*iter).c_str());
428	>	}
429	>	else if (!Platform.compare(*iter))
430	>	{
431	>	iter++; iter++;
432	>	package.platform = *iter;
433	>	}
434	>	else if (!HasOnis.compare(*iter))
435	>	{
436		iter++; iter++;
437	<	if ( boost::iequals(*iter, "Yes")) package.hasOnis = 1;
437	>	if (boost::iequals(*iter, "Yes")) package.hasOnis = 1;
438		}
439	<	else if (!HasBSL.compare(*iter)) {
440	<	if(toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasBSL = true;
441	<	else if ( boost::iequals(*iter, "Addon")) package.hasAddon = true;
439	>	else if (!HasBSL.compare(*iter))
440	>	{
441	>	iter++; iter++;
442	>	if (boost::iequals(*iter, "Yes")) package.hasBSL = true;
443	>	else if (boost::iequals(*iter, "Addon")) package.hasAddon = true;
444		}
445	<	else if (!HasDeltas.compare(*iter)) {
445	>	else if (!HasDeltas.compare(*iter))
446	>	{
447		iter++; iter++;
448	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDeltas = 1;
448	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasDeltas = 1;
449		}
450	<	else if (!HasDats.compare(*iter)) {
450	>	else if (!HasDats.compare(*iter))
451	>	{
452		iter++; iter++;
453	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.hasDats = 1;
453	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.hasDats = 1;
454		}
455	<	else if (!IsEngine.compare(*iter)) {
455	>	else if (!IsEngine.compare(*iter))
456	>	{
457		iter++; iter++;
458	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.isEngine = 1;
458	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.isEngine = 1;
459		}
460	<	else if (!GlobalNeeded.compare(*iter)) {
460	>	else if (!GlobalNeeded.compare(*iter))
461	>	{
462		iter++; iter++;
463	<	if (toupper((*iter)[0]) + toupper((*iter)[1]) + toupper((*iter)[2]) == 'Y' + 'E' + 'S') package.globalNeeded = 1;
464	<	else if (toupper((*iter)[0]) + toupper((*iter)[1]) == 'N' + 'O') package.globalNeeded = 1; // only place where checking for "No" is important atm.
463	>	if (toupper((*iter)[0]) == 'Y' && toupper((*iter)[1]) == 'E' && toupper((*iter)[2]) == 'S') package.globalNeeded = 1;
464	>	else if (toupper((*iter)[0]) == 'N' && toupper((*iter)[1]) == 'O') package.globalNeeded = 1; // only place where checking for "No" is important atm
465		}
466	<	else if (!Category.compare(*iter))  {
467	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
468	<	if (ARROW.compare(*iter) && Category.compare(*iter)) {                  // ignores "->" and "Category"
466	>	else if (!Category.compare(*iter))
467	>	{
468	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
469	>	{
470	>	if (ARROW.compare(*iter) && Category.compare(*iter)) // ignores "->" and "Category"
471		package.category += *iter + " ";
438	–	}
472		}
473		}
474	<	else if (!Creator.compare(*iter))  {    //if it contains the name
475	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
476	<	if (ARROW.compare(*iter) && Creator.compare(*iter)) {                   // ignores "->" and "Creator"
474	>	else if (!Creator.compare(*iter))
475	>	{
476	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
477	>	{
478	>	if (ARROW.compare(*iter) && Creator.compare(*iter)) // ignores "->" and "Creator"
479		package.creator += *iter + " ";
445	–	}
480		}
481		}
482	<	else if (!Readme.compare(*iter))  {     //if it contains the name
483	<	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++) {     // iterates through the words, ends if it reaches end of line or a "//" comment
484	<	if (ARROW.compare(*iter) && Readme.compare(*iter)) {                    // ignores "->" and "Readme"
485	<	if(!(*iter).compare("\\n")) package.readme += '\n';
482	>	else if (!Readme.compare(*iter))
483	>	{
484	>	for ( ; iter !=tokens.end() && SLASHSLASH.compare(*iter); iter++)
485	>	{
486	>	if (ARROW.compare(*iter) && Readme.compare(*iter)) // ignores "->" and "Readme"
487	>	{
488	>	if (!(*iter).compare("\\n")) package.readme += '\n';
489		else package.readme += *iter + " ";
490		}
491		}
492		}
493		}
457	–
494		}
495
496		return package;
#	Line 528 | Line 564 | void recompileAll(vector<string> install
564
565
566		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
567	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
567	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
568	>	dir_itr->path().filename() + " ");
569
570		system(importCommand.c_str());
571		j++;
#	Line 555 | Line 592 | void recompileAll(vector<string> install
592		else if(splitInstances == false){
593		directory_iterator end_iter;
594
595	<	for ( directory_iterator dir_itr( vanilla_dir );
596	<	dir_itr != end_iter;
597	<	++dir_itr )
598	<	{
599	<	if ( is_directory( dir_itr->status() ) )
600	<	{
601	<	numberOfDats++;
595	>
596	>	char levelnums[256] = {0};
597	>
598	>
599	>
600	>	for(int k = 0; k < 256; k++) {
601	>	if( exists( (path)("./VanillaDats/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
602	>	levelnums[k] = 1;
603	>
604		}
605		}
606	<
606	>
607	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
608	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
609	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
610	>	for(int k = 0; k < 256; k++) {
611	>	if( globalPackages[j].hasOnis &&
612	>	exists( (path)("packages/" + globalPackages[j].modStringName + "/oni/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
613	>	levelnums[k] = 1;
614	>
615	>	}
616	>	}
617	>	}
618	>	}
619	>	}
620	>	for (int levelnum = 0; levelnum < 256; levelnum++)
621	>	if (levelnums[levelnum])
622	>	numberOfDats++;
623	>
624		out << numberOfDats;
625		datString = out.str();
626	<
627	<	for ( directory_iterator dir_itr( vanilla_dir );
572	<	dir_itr != end_iter;
573	<	++dir_itr )
574	<	{
626	>
627	>	for(int levelnum = 0; levelnum < 256; levelnum++) {
628		try
629		{
630	<	if ( is_directory( dir_itr->status() ) )
630	>	if ( levelnums[levelnum] )
631		{
632	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
632	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + "level" + lexical_cast<std::string>(levelnum) + "_Final ";
633		for (unsigned int i = 0; i < installedMods.size(); ++i) {
634	<	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
635	<	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
634	>	if (exists((path)("packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_final") ))
635	>	importCommand += " packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_Final";
636		}
637	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
637	>	importCommand += " ../GameDataFolder/level" + lexical_cast<std::string>(levelnum) + "_Final.dat >> Install.log";
638
639		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
640	<	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +  dir_itr->path().filename() + " ");
640	>	setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
641	>	"level" + lexical_cast<std::string>(levelnum) + "_Final"+ " ");
642		system(importCommand.c_str());
643		j++;
644		}
#	Line 604 | Line 658 | void recompileAll(vector<string> install
658		vector<string> skippedfolders;
659
660		ofstream BSLlog("BSL.log");
661	+	if(exists("../GameDataFolder/BSLBackup/")) {
662	+	remove_all("../GameDataFolder/BSLBackup/");
663	+	}
664	+	else {
665	+	create_directory("../GameDataFolder/BSLBackup/");
666	+	}
667	+	copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/");
668		for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
669		dir_itr != end_itr;
670		++dir_itr ) {
#	Line 616 | Line 677 | void recompileAll(vector<string> install
677		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
678		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
679		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
680	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
680	>	if(globalPackages[j].hasBSL) break; //skip non-BSL
681		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
682		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
683		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 625 | Line 686 | void recompileAll(vector<string> install
686		}
687		}
688
689	+
690	+
691		ModPackage emptyPackage;
692		emptyPackage.modStringName = "VanillaBSL";
693		emptyPackage.hasBSL = 1;
694		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
695		BSLlog.close();
696	<
696	>
697	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
698	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
699	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
700	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
701	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
702	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
703	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
704	>	}
705	>	}
706	>	}
707	>	}
708	>
709		logfile << "Writing config file";
710		writeInstalledMods(installedMods);
711		setProgressBar(1000);
#	Line 661 | Line 736 | void recompileAll(vector<string> install
736
737		void copyBSL(string copypath, vector<string>& BSLfolders, ModPackage pkg)
738		{
739	<	ofstream BSLlog("BSL2.log", ios::app );
739	>	ofstream BSLlog("BSL.log", ios::app );
740
741		try {
742		for ( directory_iterator dir_itr( copypath ), end_itr;
#	Line 671 | Line 746 | void copyBSL(string copypath, vector<str
746		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
747		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
748		int skip_folder = 0;
749	<
750	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
751	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
752	<	if(dir_itr->path().filename() == BSLfolders[k]) {
753	<	skip_folder = 1;
754	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
755	<	break;
749	>	if(!pkg.hasAddon) {
750	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
751	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
752	>	if(dir_itr->path().filename() == BSLfolders[k]) {
753	>	skip_folder = 1;
754	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
755	>	break;
756	>	}
757		}
758		}
759		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
760	<	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
760	>	if(!pkg.hasAddon) remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
761		Sleep(100);
762		create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
763		BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
#	Line 689 | Line 765 | void copyBSL(string copypath, vector<str
765		bsl_itr != end_itr;
766		bsl_itr++ ) {
767		if ( bsl_itr->path().extension() == ".bsl" ) {
768	+	if(exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()))
769	+	remove("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
770		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
771		}
772		}
773	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
774	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
773	>	if( !pkg.hasAddon ) {
774	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
775	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
776	>	}
777		}
778		}
779		}
#	Line 769 | Line 849 | vector<string> getInstallString(string C
849		|                                                          Installer to be replaced (when the new Installer                     |
850		|                                                          launches, this function will be called again but will        |
851		|                                                          return UPDATE_SIMP_AVAIL or UPDATE_GLOB_AVAIL)                       |
852	+	|  UPDATE_PKG_AVAIL                     -- A newer version of individual package(s) is available        |
853		\* UPDATE_CONT_UPD                      -- Currently unused                                                                                */
854		int GetUpdateStatus(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
855		{
#	Line 797 | Line 878 | int GetUpdateStatus(Install_info_cfg *cu
878		else
879		return UPDATE_LOG_READ_ERR;
880		}
881	<
882	<	// Is there an update folder, and is it a monthly release or a patch?
883	<	if (!exists("../updates/Edition"))
881	>
882	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
883	>	bool firstParty = 0;
884	>	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
885	>	if (!exists("../updates"))
886	>	create_directory("../updates");
887	>	if (exists("../updates/Edition"))
888		{
889	+	firstParty = 1;
890	+	}
891	+	else {
892		strEUFN = "Edition-patch";
893	<	if (!exists("../updates/Edition-patch"))
894	<	return UPDATE_NO_UPD_AVAIL;
893	>	if (exists("../updates/Edition-patch")) {
894	>	firstParty = 1;
895	>	}
896	>
897		}
898	<
899	<	// Unlike the current AE's version info, we *need* to find the update's version info or we won't continue
900	<	string updateCfgPath = ("../updates/" + strEUFN + "/install/packages/Globalize/Install_Info.cfg");
901	<	updateAECfg.open(updateCfgPath.c_str());
902	<	if (!updateAECfg.fail())
903	<	{
904	<	if (!ReadInstallInfoCfg(&updateAECfg, updateAE))
898	>
899	>	if(firstParty) {
900	>	// Unlike the current AE's version info, we *need* to find the update's version info or we won't continue
901	>	string updateCfgPath = ("../updates/" + strEUFN + "/install/packages/Globalize/Install_Info.cfg");
902	>	updateAECfg.open(updateCfgPath.c_str());
903	>	if (!updateAECfg.fail())
904	>	{
905	>	if (!ReadInstallInfoCfg(&updateAECfg, updateAE))
906	>	return UPDATE_LOG_READ_ERR;
907	>
908	>	updateAECfg.close();
909	>	updateAECfg.clear();
910	>	}
911	>	else
912		return UPDATE_LOG_READ_ERR;
816	–
817	–	updateAECfg.close();
818	–	updateAECfg.clear();
819	–	}
820	–	else
821	–	return UPDATE_LOG_READ_ERR;
913
914	<	// Now we check for an Installer update in progress
915	<	if (exists("Update.log"))
916	<	{
917	<	updateLog.open("Update.log");
918	<	if (!updateLog.fail())
828	<	{
829	<	vector<string> lines;
830	<	string line;
831	<	int num_lines = 0;
832	<	bool readingInstallerVersion = false, doneReadingFile = false;
833	<
834	<	while (!updateLog.eof() && !doneReadingFile)
914	>	// Now we check for an Installer update in progress
915	>	if (exists("Update.log"))
916	>	{
917	>	updateLog.open("Update.log");
918	>	if (!updateLog.fail())
919		{
920	<	getline(updateLog, line);
921	<	lines.push_back(line);
922	<	num_lines++;
923	<	vector<string> tokens;
924	<	vector<string>::iterator iter;
925	<	tokenize(line, tokens);
842	<	iter = tokens.begin();
843	<	if (!readingInstallerVersion && tokens.capacity() >= 4)
920	>	vector<string> lines;
921	>	string line;
922	>	int num_lines = 0;
923	>	bool readingInstallerVersion = false, doneReadingFile = false;
924	>
925	>	while (!updateLog.eof() && !doneReadingFile)
926		{
927	<	if (!strInstaller.compare(*iter))
927	>	getline(updateLog, line);
928	>	lines.push_back(line);
929	>	num_lines++;
930	>	vector<string> tokens;
931	>	vector<string>::iterator iter;
932	>	tokenize(line, tokens);
933	>	iter = tokens.begin();
934	>	if (!readingInstallerVersion && tokens.capacity() >= 4)
935		{
936	<	if (!strBeing.compare(*++iter))
937	<	readingInstallerVersion = true;
938	<	else if (!strWas.compare(*iter))
939	<	*installerJustUpdated = true; // our third indirect return value after currentAE and updateAE
936	>	if (!strInstaller.compare(*iter))
937	>	{
938	>	if (!strBeing.compare(*++iter))
939	>	readingInstallerVersion = true;
940	>	else if (!strWas.compare(*iter))
941	>	*installerJustUpdated = true; // our third indirect return value after currentAE and updateAE
942	>	}
943		}
944	<	}
853	<	else if (readingInstallerVersion && tokens.capacity() >= 3)
854	<	{
855	<	readingInstallerVersion = false;
856	<	string installerVersion = INSTALLER_VERSION;
857	<	if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
858	<	return UPDATE_INST_REPL_ERR;
859	<	else
944	>	else if (readingInstallerVersion && tokens.capacity() >= 3)
945		{
946	<	updateLog.close();
947	<	updateLog.clear();
948	<	Sleep(1000);
949	<	remove("Update.log");
950	<	ofstream newUpdateLog("Update.log");
866	<	if (!newUpdateLog.fail())
946	>	readingInstallerVersion = false;
947	>	string installerVersion = INSTALLER_VERSION;
948	>	if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
949	>	return UPDATE_INST_REPL_ERR;
950	>	else
951		{
952	<	// Write over old log with updated information
953	<	ptime startTime(second_clock::local_time());
954	<	string strStartTime = to_simple_string(startTime);
955	<	string newUpdateLine = installerVersion + " on " + strStartTime;
956	<	for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
952	>	updateLog.close();
953	>	updateLog.clear();
954	>	Sleep(1000);
955	>	remove("Update.log");
956	>	ofstream newUpdateLog("Update.log");
957	>	if (!newUpdateLog.fail())
958		{
959	<	newUpdateLog << lines[a].c_str();
960	<	newUpdateLog << "\n";
959	>	// Write over old log with updated information
960	>	ptime startTime(second_clock::local_time());
961	>	string strStartTime = to_simple_string(startTime);
962	>	string newUpdateLine = installerVersion + " on " + strStartTime;
963	>	for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
964	>	{
965	>	newUpdateLog << lines[a].c_str();
966	>	newUpdateLog << "\n";
967	>	}
968	>	newUpdateLog << "Installer was updated to:\n";
969	>	newUpdateLog << newUpdateLine.c_str();
970	>	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerApp::OnInit()
971	>	doneReadingFile = true;
972	>	newUpdateLog.close();
973	>	newUpdateLog.clear();
974	>	//return UPDATE_CONT_UPD; // as noted above, we are not using this return value; in fact, we want...
975	>	//                                                       ...the code to continue running down through the Edition version check
976		}
977	<	newUpdateLog << "Installer was updated to:\n";
978	<	newUpdateLog << newUpdateLine.c_str();
879	<	*installerJustUpdated = true; // this value is indirectly returned to AEInstallerAp::OnInit()
880	<	doneReadingFile = true;
881	<	newUpdateLog.close();
882	<	newUpdateLog.clear();
883	<	//return UPDATE_CONT_UPD; // as noted above, we are not using this return value; in fact, we want...
884	<	//                                                       ...the code to continue running down through the Edition version check
977	>	else
978	>	return UPDATE_LOG_READ_ERR;
979		}
886	–	else
887	–	return UPDATE_LOG_READ_ERR;
980		}
981		}
982	+	updateLog.close();
983	+	updateLog.clear();
984	+	}
985	+	else
986	+	return UPDATE_LOG_READ_ERR;
987	+	}
988	+
989	+	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
990	+	{
991	+	string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
992	+	string installerVersion = INSTALLER_VERSION;
993	+	if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
994	+	{
995	+	if (exists(strNewInstallerPath))
996	+	return UPDATE_INST_AVAIL;
997		}
998	<	updateLog.close();
999	<	updateLog.clear();
998	>	else if (updateAE->globalizationRequired)
999	>	return UPDATE_GLOB_AVAIL;
1000	>	else
1001	>	return UPDATE_SIMP_AVAIL;
1002		}
1003		else
1004	<	return UPDATE_LOG_READ_ERR;
1004	>	return UPDATE_MNTH_REQD_ERR;
1005		}
1006	<
898	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
1006	>	try
1007		{
1008	<	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
1009	<	{
902	<	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
903	<	return UPDATE_MNTH_REQD_ERR;
904	<	}
905	<	string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
906	<	string installerVersion = INSTALLER_VERSION;
907	<	if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
1008	>	directory_iterator end;
1009	>	if (exists("../updates"))
1010		{
1011	<	if (exists(strNewInstallerPath))
1012	<	return UPDATE_INST_AVAIL;
1011	>	for (directory_iterator install_iter("../updates"); install_iter != end; ++install_iter)
1012	>	{
1013	>	ModPackage installedPackage, updatePackage;
1014	>	if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
1015	>	{
1016	>	fstream file;
1017	>	file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1018	>	if (!file.fail())
1019	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1020	>	else
1021	>	{
1022	>	file.close();
1023	>	continue;
1024	>	}
1025	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1026	>	{
1027	>	file.close();
1028	>	file.clear();
1029	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1030	>	if (!file.fail())
1031	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1032	>	file.close();
1033	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1034	>	{
1035	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1036	>	return UPDATE_PKG_AVAIL;
1037	>	}
1038	>	}
1039	>	else
1040	>	{
1041	>	file.close();
1042	>	return UPDATE_PKG_AVAIL;
1043	>	}
1044	>	}
1045	>	}
1046		}
912	–	else if (updateAE->globalizationRequired)
913	–	return UPDATE_GLOB_AVAIL;
914	–	else
915	–	return UPDATE_SIMP_AVAIL;
1047		}
1048	<	else
1049	<	return UPDATE_NO_UPD_AVAIL;
1050	<
1048	>	catch (exception & ex) {
1049	>	//      setStatusArea("Warning, handled exception: " + (string)ex.what());
1050	>	}
1051	>
1052		return UPDATE_NO_UPD_AVAIL;
1053		}
1054
#	Line 930 | Line 1062 | bool ReadInstallInfoCfg(fstream *fileHan
1062		string strDaodanVersion = "Daodan_Version";
1063		string strOniSplitVersion = "OniSplit_Version";
1064		string strGUIWinVersion = "GUI_Win_Version";
1065	<	string strGUIMacVersion = "GUI_Mac_Version";
1065	>	string strGUIMacVersion = "GUI_Mac_Version";
1066		string strReglobalize = "Reglobalize";
1067		string strDeleteList = "Delete_List";
1068		string strArrow = "->";
#	Line 939 | Line 1071 | bool ReadInstallInfoCfg(fstream *fileHan
1071
1072		while (getline(*fileHandler, line))
1073		{
1074	+	StripNewlines(&line);
1075		tokenize(line, tokens);
1076		iter = tokens.begin();
1077
#	Line 1141 | Line 1274 | bool ProcessInstallerUpdate(Install_info
1274
1275		string popenCommand = "../updates/" + strEUFN + "/install/";
1276		#ifdef WIN32
1277	<	// TODO: Fill in Windows equivalent of code below :-3
1277	>	popenCommand = "replace_installer.bat";
1278		#else
1279		// We can't just use '~' to mean "the home directory" because we need to check the path in C...
1280		// ...so we actually get the current user's shortname and manually construct the path to home
#	Line 1163 | Line 1296 | bool ProcessInstallerUpdate(Install_info
1296		#endif
1297		file.close();
1298		file.clear();
1299	+	#ifdef WIN32
1300	+	system(popenCommand.c_str());
1301	+	#else
1302		popen(popenCommand.c_str(), "r");
1303	<
1303	>	#endif
1304		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1305		}
1306
1307		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1308		{
1309	+	try {
1310		fstream file;
1311		string line;
1312		vector<string> tokens, updateStarted;
#	Line 1189 | Line 1326 | bool ProcessAEUpdate(Install_info_cfg *c
1326		string strOniApp = "Oni.exe";
1327		#else
1328		string strOniApp = "Oni.app";
1192	–	#endif
1329		bool needNewTrashDir = false;
1330	+	#endif
1331	+
1332		bool readingVerAndDate = false;
1333
1196	–	// TODO: Fill in Windows equivalent of code below
1334		#ifdef WIN32
1335	<	string strTrashDir = "%RECYCLE%";
1335	>	//remove readonly attrib from files.
1336	>	setStatusArea("Removing readonly attribute...");
1337	>	system("attrib -r ./* /s");
1338	>	system("attrib -r ../Oni.exe /s");
1339	>	system("attrib -r ../binkw32.dll /s");
1340	>
1341		#else
1342		FILE *fUserName = NULL;
1343		char chrUserName[32];
#	Line 1230 | Line 1372 | bool ProcessAEUpdate(Install_info_cfg *c
1372		if (readingVerAndDate && tokens.capacity() >= 3)
1373		tokenize(tokens[2], updateStarted, "-");
1374		}
1375	+	#ifndef WIN32
1376		if (updateStarted.capacity() < 3)
1377		needNewTrashDir = true;
1378		else
#	Line 1239 | Line 1382 | bool ProcessAEUpdate(Install_info_cfg *c
1382		if (!exists(strTrashDir))
1383		needNewTrashDir = true;
1384		}
1385	+	#endif
1386		}
1387	<
1387	>	#ifndef WIN32
1388		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
1389		{
1390		tm tmStartTime = to_tm(startTime);
#	Line 1248 | Line 1392 | bool ProcessAEUpdate(Install_info_cfg *c
1392		boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1393		create_directory(strTrashDir);
1394		}
1395	+	#endif
1396		file.close();
1397		file.clear();
1398
1399		// Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
1400		if (exists(strPathToEUFN + strOniApp))
1401		{
1402	<	if (exists(strOniApp))
1403	<	rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1404	<	rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1402	>	if (exists("../" + strOniApp))
1403	>	#ifdef WIN32
1404	>	remove((path)("../" + strOniApp));
1405	>	#else
1406	>	rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
1407	>	#endif
1408	>	rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
1409		}
1410		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
1411		{
1412		if (exists(strPathToEUFNInstall + strOniSplit))
1413		{
1414		if (exists(strOniSplit))
1415	+	#ifdef WIN32
1416	+	remove((path)strOniSplit);
1417	+	#else
1418		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1419	+	#endif
1420		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1421		}
1422		}
#	Line 1273 | Line 1426 | bool ProcessAEUpdate(Install_info_cfg *c
1426		if (exists(strPathToEUFN + strDaodan))
1427		{
1428		if (exists(("../" + strDaodan)))
1429	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1429	>	remove((path)("../" + strDaodan));
1430		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1431		}
1432		}
#	Line 1282 | Line 1435 | bool ProcessAEUpdate(Install_info_cfg *c
1435		if (exists(strPathToEUFNInstall + strWinGUI))
1436		{
1437		if (exists((path)strWinGUI))
1438	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1438	>	remove((path)strWinGUI);
1439		if (exists(strWinGUILang))
1440	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1440	>	remove((path)strWinGUILang);
1441		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1442		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1443		}
#	Line 1317 | Line 1470 | bool ProcessAEUpdate(Install_info_cfg *c
1470		while (curPos != string::npos && curPos < thePath.size())
1471		{
1472		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1473	+	#ifndef WIN32
1474		if (!exists(strTrashDir + aParentPath))
1475		create_directory(strTrashDir + aParentPath);
1476	+	#endif
1477		lastPos = curPos + 1;
1478		curPos = thePath.find("/", lastPos);
1479		aParentPath = aParentPath + "/";
1480		}
1481	+	#ifndef WIN32
1482		rename((path)("../" + thePath), (path)(strTrashDir + thePath));
1483	+	#else
1484	+	remove((path)("../" + thePath));
1485	+	#endif
1486		}
1487		}
1488
1489	<	// Now we crawl the update's package folders for newer versions and move them over, trashing ones that are already present
1331	<	vector<ModPackage> updatePackages, currentPackages;
1332	<	bool matchFound;
1333	<	updatePackages.reserve(256);
1334	<	currentPackages.reserve(256);
1489	>	ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1490
1491	<	currentPackages = getPackages();
1492	<	updatePackages = getPackages(strPathToEUFNPackages);
1493	<
1494	<	for (vector<ModPackage>::iterator iter1 = updatePackages.begin(); iter1 != updatePackages.end(); iter1++)
1491	>	// Next, move over files in the update's Globalize folder; subfolders which do not exist in the current AE will be created by Boost's...
1492	>	// ...create_directories() function
1493	>	string strPath;
1494	>	path thePath;
1495	>	for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr)
1496		{
1497	<	matchFound = false;
1498	<	for (vector<ModPackage>::iterator iter2 = currentPackages.begin(); iter2 != currentPackages.end(); iter2++)
1497	>	strPath = dir_itr->path().string();
1498	>	MakePathLocalToGlobalize(&strPath);
1499	>	thePath = (path)strPath;
1500	>	if (is_regular_file(dir_itr->status()))
1501		{
1502	<	if (!iter1->modStringName.compare(iter2->modStringName))
1502	>	if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1503		{
1504	<	matchFound = true;
1505	<	if (iter1->modStringVersion > iter2->modStringVersion)
1504	>	if (exists(strPathToPackages + strGlobalize + strPath))
1505	>	{
1506	>	#ifdef WIN32
1507	>	remove((path)(strPathToPackages + strGlobalize + strPath));
1508	>	#else
1509	>	create_directories((path)(strTrashDir + thePath.parent_path().string()));
1510	>	rename((path)(strPathToPackages + strGlobalize + strPath), (path)(strTrashDir + strPath));
1511	>	#endif
1512	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1513	>	}
1514	>	else
1515		{
1516	<	rename((path)(strPathToPackages + iter2->modStringName), (path)(strTrashDir + iter2->modStringName));
1517	<	rename((path)(strPathToEUFNPackages + iter1->modStringName), (path)(strPathToPackages + iter1->modStringName));
1516	>	int slashLoc = 0;
1517	>	slashLoc = strPath.find("/", 0);
1518	>	if (slashLoc != string::npos) // then path contains slashes, so we need to make sure its parents' paths exist before moving it
1519	>	create_directories((path)(strPathToPackages + strGlobalize + thePath.parent_path().string()));
1520	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1521		}
1522		}
1523		}
1354	–	if (!matchFound) // then there's no old package in the way, so just move in the one from the update
1355	–	rename((path)(strPathToEUFNPackages + iter1->modStringName), (path)(strPathToPackages + iter1->modStringName));
1356	–	}
1357	–
1358	–	// 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...
1359	–	// ...and folders which do not exist in the current AE will be created there
1360	–	vector<string> foldersToMake, filesToMove;
1361	–	string thePath;
1362	–	for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr)
1363	–	{
1364	–	thePath = dir_itr->path().string();
1365	–	MakePathLocalToGlobalize(&thePath);
1366	–	if (is_regular_file(dir_itr->status()))
1367	–	{
1368	–	if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1369	–	filesToMove.push_back(thePath);
1370	–	}
1371	–	else if (is_directory(dir_itr->status()))
1372	–	{
1373	–	if (!exists(strPathToPackages + strGlobalize + thePath))
1374	–	foldersToMake.push_back(thePath);
1375	–	}
1376	–	}
1377	–	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1378	–	// ...before folder 'parent/child/'"?
1379	–	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1380	–	// First make the folders that don't exist in the current AE, so all the files have a place to go
1381	–	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1382	–	{
1383	–	create_directory(strPathToPackages + strGlobalize + *iter);
1384	–	}
1385	–	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1386	–	{
1387	–	if (exists(strPathToPackages + strGlobalize + *iter))
1388	–	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1389	–	rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1524		}
1525
1526		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1527	+	#ifdef WIN32
1528	+	remove_all((path)strPathToEUFN);
1529	+	#else
1530		create_directory(strTrashDir + "Unneeded update files");
1531		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1532	<
1532	>	#endif
1533		// Write to log that we are finished with update
1534		ptime end_time(second_clock::local_time());
1535		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1410 | Line 1547 | bool ProcessAEUpdate(Install_info_cfg *c
1547		CheckForGlobalization(true); // the 'true' value forces re-globalization
1548
1549		globalPackages = getPackages(); // refresh the list in memory
1550	<
1551	<	// TODO: Refresh the packages list in the window
1415	<
1550	>	wxCommandEvent e;
1551	>	TheWindow->OnRefreshButtonClick( e );
1552		return true;
1553	+	}
1554	+	catch (exception & ex)
1555	+	{
1556	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1557	+	return false;
1558	+	}
1559	+	}
1560	+
1561	+	void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1562	+	{
1563	+	ptime startTime(second_clock::local_time());
1564	+	#ifdef WIN32
1565	+	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1566	+	#else
1567	+	FILE *fUserName = NULL;
1568	+	char chrUserName[32];
1569	+	fUserName = popen("whoami", "r");
1570	+	fgets(chrUserName, sizeof(chrUserName), fUserName);
1571	+	pclose(fUserName);
1572	+	string strUserName = (string)chrUserName; // stringsblaaarrrgggghhhh
1573	+	int endOfName = strUserName.find("\n", 0);
1574	+	string strTrashDir = "/Users/" + strUserName.substr(0, endOfName) + "/.Trash/";
1575	+	bool needNewTrashDir = true;
1576	+	tm tmStartTime = to_tm(startTime);
1577	+	#endif
1578	+
1579	+	try
1580	+	{
1581	+	directory_iterator end;
1582	+	for (directory_iterator update_iter(pathToUpdate); update_iter != end; ++update_iter)
1583	+	{
1584	+	ModPackage installedPackage, updatePackage;
1585	+	string updtPath = update_iter->path().string();
1586	+	string updtFolder = update_iter->path().filename();
1587	+	string updtModInfo = updtPath + "/Mod_Info.cfg";
1588	+	string instModInfo = strPathToPackages + "/" + updtFolder + "/Mod_Info.cfg";
1589	+	if (!boost::iequals(updtFolder, "Edition")
1590	+	&& !boost::iequals(updtFolder, "Edition-patch")
1591	+	&& is_directory(update_iter->path())
1592	+	&& exists(updtModInfo))
1593	+	{
1594	+	fstream file;
1595	+	file.open((updtModInfo).c_str());
1596	+	if (!file.fail())
1597	+	updatePackage = fileToModPackage(file, updtFolder);
1598	+	else
1599	+	{
1600	+	file.close();
1601	+	continue;
1602	+	}
1603	+	if (exists(instModInfo))
1604	+	{
1605	+	file.close();
1606	+	file.clear();
1607	+	file.open(instModInfo.c_str());
1608	+	if (!file.fail())
1609	+	{
1610	+	installedPackage = fileToModPackage(file, updtFolder);
1611	+	}
1612	+	file.close();
1613	+	}
1614	+	file.close();
1615	+	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1616	+	{
1617	+	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1618	+	{
1619	+	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1620	+	#ifdef WIN32
1621	+	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1622	+	#else
1623	+	if (needNewTrashDir)
1624	+	{
1625	+	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1626	+	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1627	+	create_directory(strTrashDir);
1628	+	needNewTrashDir = false;
1629	+	}
1630	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1631	+	#endif
1632	+	}
1633	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1634	+	}
1635	+	}
1636	+	}
1637	+	}
1638	+	}
1639	+	catch (exception & ex)
1640	+	{
1641	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1642	+	}
1643	+	wxCommandEvent e;
1644	+	TheWindow->OnRefreshButtonClick( e );
1645		}
1646
1647		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
#	Line 1457 | Line 1685 | void tokenize(const string& str, vector<
1685		}
1686		}
1687
1688	+	/* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
1689	+	|  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
1690	+	\  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
1691	+	void StripNewlines(string *theLine)
1692	+	{
1693	+	int deleteFromHere = 0;
1694	+	deleteFromHere = theLine->find("\r");
1695	+	if (deleteFromHere > 0)
1696	+	theLine->erase(deleteFromHere, theLine->size());
1697	+	}
1698	+
1699		void clearOldDats(void) {
1700		directory_iterator end_iter_gdf;
1701		for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );
#	Line 1501 | Line 1740 | void copy( const path & from_ph,
1740
1741		}
1742		else if(from_ph.filename() != ".svn")
1743	<	{
1744	<	path destination;
1745	<	if(!exists(to_ph))
1746	<	{
1747	<	destination=to_ph;
1748	<	}
1749	<	else
1750	<	{
1751	<	destination=to_ph/from_ph.filename();
1752	<	}
1743	>	{
1744	>	path destination;
1745	>	if(!exists(to_ph))
1746	>	{
1747	>	destination=to_ph;
1748	>	}
1749	>	else
1750	>	{
1751	>	destination=to_ph/from_ph.filename();
1752	>	}
1753
1754	<	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1754	>	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1755		{
1756		//the idiot who coded this in the first place (not me)
1757		//forgot to make a new directory. Exception city. x_x
1758	<	create_directory(destination);
1759	<	copy(*i,destination/i->filename());
1758	>	create_directory(destination);
1759	>	copy(*i, destination/i->filename());
1760		}
1761		}
1762		}
#	Line 1571 | Line 1810 | ModPackage::ModPackage()
1810		name = "";
1811		modStringName = "";
1812		modStringVersion = 0;
1813	+	platform = "Both";
1814		hasOnis = false;
1815		hasDeltas = false;
1816		hasBSL = false;

Diff Legend

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