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 509 by gumby, Sat Apr 24 19:19:14 2010 UTC vs.
Revision 570 by gumby, Wed Jul 21 22:44:28 2010 UTC

#	Line 24 | Line 24
24		using namespace boost::gregorian;
25		using namespace boost::posix_time;
26
27	–	// externs declared in installer.h
27		string strInstallCfg = "../GameDataFolder/Add.cfg";
28		string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
29	+	extern MainWindow* TheWindow;
30
31		int globalizeData(void)
32		{
#	Line 309 | Line 309 | int globalizeData(void)
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 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());
315	–	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
316	–	*/
312		string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"
313		+ fullAEpath + "'";
314		system(prefsCommand.c_str());
#	Line 352 | Line 347 | vector<ModPackage> getPackages(string pa
347		if (!file.fail())
348		{
349		package = fileToModPackage(file, dir_itr->path().filename());
350	<	if (package.installerVersion.compare(INSTALLER_VERSION) < 1)  // if mod requires newer version of the Installer, we won't add it to the list
350	>
351	>	if (package.installerVersion.compare(gInstallerVersion) < 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
#	Line 378 | Line 374 | vector<ModPackage> getPackages(string pa
374		ModPackage fileToModPackage(fstream &file, string modName)
375		{
376		ModPackage package;
381	–	string line;
377		const string AEInstallVersion = "AEInstallVersion"; // used for comparing to the current token...
378		const string NameOfMod = "NameOfMod";
379		const string ARROW = "->";
#	Line 394 | Line 389 | ModPackage fileToModPackage(fstream &fil
389		const string GlobalNeeded = "GlobalNeeded";
390		const string Category = "Category";
391		const string Creator = "Creator";
397	–	package.modStringName = modName;
392		while (!file.eof())
393		{
394	<	getline(file,line);
395	<	vector<string> tokens;
394	>	string line;
395	>	getline(file, line);
396	>	vector<string> tokens;
397		vector<string>::iterator iter;
398		tokenize(line, tokens);
399		if (tokens.capacity() >= 3)
400		{
401	+	for (int a = 0; a < tokens.size(); a++)
402	+	StripNewlines(&tokens.at(a));
403		iter = tokens.begin();
404	<
404	>
405		if (!AEInstallVersion.compare(*iter))
406		{
407		iter++; iter++;
#	Line 425 | Line 422 | ModPackage fileToModPackage(fstream &fil
422		iter++;
423		package.modStringVersion = atof((*iter).c_str());
424		}
425	<	else if (!ModString.compare(*iter))
425	>	else if (!ModVersion.compare(*iter))
426		{
427		iter++; iter++;
428		package.modStringVersion = atof((*iter).c_str());
#	Line 496 | Line 493 | ModPackage fileToModPackage(fstream &fil
493		}
494		}
495		}
496	<
496	>	package.modStringName = modName;
497		return package;
498		}
499
#	Line 596 | Line 593 | void recompileAll(vector<string> install
593		else if(splitInstances == false){
594		directory_iterator end_iter;
595
596	<	for ( directory_iterator dir_itr( vanilla_dir );
597	<	dir_itr != end_iter;
598	<	++dir_itr )
599	<	{
600	<	if ( is_directory( dir_itr->status() ) )
601	<	{
602	<	numberOfDats++;
596	>
597	>	char levelnums[256] = {0};
598	>
599	>
600	>
601	>	for(int k = 0; k < 256; k++) {
602	>	if( exists( (path)("./VanillaDats/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
603	>	levelnums[k] = 1;
604	>
605		}
606		}
607	<
607	>
608	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
609	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
610	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
611	>	for(int k = 0; k < 256; k++) {
612	>	if( globalPackages[j].hasOnis &&
613	>	exists( (path)("packages/" + globalPackages[j].modStringName + "/oni/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
614	>	levelnums[k] = 1;
615	>
616	>	}
617	>	}
618	>	}
619	>	}
620	>	}
621	>	for (int levelnum = 0; levelnum < 256; levelnum++)
622	>	if (levelnums[levelnum])
623	>	numberOfDats++;
624	>
625		out << numberOfDats;
626		datString = out.str();
627	<
628	<	for ( directory_iterator dir_itr( vanilla_dir );
613	<	dir_itr != end_iter;
614	<	++dir_itr )
615	<	{
627	>
628	>	for(int levelnum = 0; levelnum < 256; levelnum++) {
629		try
630		{
631	<	if ( is_directory( dir_itr->status() ) )
631	>	if ( levelnums[levelnum] )
632		{
633	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
633	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + "level" + lexical_cast<std::string>(levelnum) + "_Final ";
634		for (unsigned int i = 0; i < installedMods.size(); ++i) {
635	<	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
636	<	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
635	>	if (exists((path)("packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_final") ))
636	>	importCommand += " packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_Final";
637		}
638	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
638	>	importCommand += " ../GameDataFolder/level" + lexical_cast<std::string>(levelnum) + "_Final.dat >> Install.log";
639
640		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
641		setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
642	<	dir_itr->path().filename() + " ");
642	>	"level" + lexical_cast<std::string>(levelnum) + "_Final"+ " ");
643		system(importCommand.c_str());
644		j++;
645		}
#	Line 646 | Line 659 | void recompileAll(vector<string> install
659		vector<string> skippedfolders;
660
661		ofstream BSLlog("BSL.log");
662	+	if(!exists("../GameDataFolder/BSLBackup/")) {
663	+	create_directory("../GameDataFolder/BSLBackup/");
664	+	copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/");
665	+	}
666	+
667		for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
668		dir_itr != end_itr;
669		++dir_itr ) {
#	Line 658 | Line 676 | void recompileAll(vector<string> install
676		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
677		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
678		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
679	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
679	>	if(!globalPackages[j].hasBSL) break; //skip non-BSL
680		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
681		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
682		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 667 | Line 685 | void recompileAll(vector<string> install
685		}
686		}
687
688	+
689	+
690		ModPackage emptyPackage;
691		emptyPackage.modStringName = "VanillaBSL";
692		emptyPackage.hasBSL = 1;
693		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
694		BSLlog.close();
695	<
695	>
696	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
697	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
698	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
699	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
700	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
701	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
702	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
703	>	}
704	>	}
705	>	}
706	>	}
707	>
708		logfile << "Writing config file";
709		writeInstalledMods(installedMods);
710		setProgressBar(1000);
#	Line 713 | Line 745 | void copyBSL(string copypath, vector<str
745		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
746		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
747		int skip_folder = 0;
748	<
749	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
750	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
751	<	if(dir_itr->path().filename() == BSLfolders[k]) {
752	<	skip_folder = 1;
753	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
754	<	break;
748	>	if(!pkg.hasAddon) {
749	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
750	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
751	>	if(dir_itr->path().filename() == BSLfolders[k]) {
752	>	skip_folder = 1;
753	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
754	>	break;
755	>	}
756		}
757		}
758		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
759	<	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
759	>	if(!pkg.hasAddon) remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
760		Sleep(100);
761		create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
762		BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
#	Line 731 | Line 764 | void copyBSL(string copypath, vector<str
764		bsl_itr != end_itr;
765		bsl_itr++ ) {
766		if ( bsl_itr->path().extension() == ".bsl" ) {
767	+	if(exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()))
768	+	remove("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
769		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
770		}
771		}
772	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
773	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
772	>	if( !pkg.hasAddon ) {
773	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
774	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
775	>	}
776		}
777		}
778		}
#	Line 841 | Line 878 | int GetUpdateStatus(Install_info_cfg *cu
878		return UPDATE_LOG_READ_ERR;
879		}
880
881	<	// Is there an update folder, and is it a monthly release or a patch?
881	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
882		bool firstParty = 0;
883	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
884	+	if (!exists("../updates"))
885	+	create_directory("../updates");
886		if (exists("../updates/Edition"))
887		{
888		firstParty = 1;
#	Line 903 | Line 943 | int GetUpdateStatus(Install_info_cfg *cu
943		else if (readingInstallerVersion && tokens.capacity() >= 3)
944		{
945		readingInstallerVersion = false;
946	<	string installerVersion = INSTALLER_VERSION;
907	<	if (installerVersion.compare(*iter)) // then the shell script-powered replacement failed
946	>	if (gInstallerVersion.compare(*iter)) // then the shell script-powered replacement failed
947		return UPDATE_INST_REPL_ERR;
948		else
949		{
#	Line 918 | Line 957 | int GetUpdateStatus(Install_info_cfg *cu
957		// Write over old log with updated information
958		ptime startTime(second_clock::local_time());
959		string strStartTime = to_simple_string(startTime);
960	<	string newUpdateLine = installerVersion + " on " + strStartTime;
960	>	string newUpdateLine = gInstallerVersion + " on " + strStartTime;
961		for (int a = 0; a < lines.capacity() - 2; a++) // if there were even lines in the log before this at all
962		{
963		newUpdateLog << lines[a].c_str();
#	Line 945 | Line 984 | int GetUpdateStatus(Install_info_cfg *cu
984		return UPDATE_LOG_READ_ERR;
985		}
986
987	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
987	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
988		{
950	–	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
951	–	{
952	–	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
953	–	return UPDATE_MNTH_REQD_ERR;
954	–	}
989		string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
990	<	string installerVersion = INSTALLER_VERSION;
957	<	if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
990	>	if (updateAE->InstallerVersion.compare(gInstallerVersion) >= 1)
991		{
992		if (exists(strNewInstallerPath))
993		return UPDATE_INST_AVAIL;
#	Line 964 | Line 997 | int GetUpdateStatus(Install_info_cfg *cu
997		else
998		return UPDATE_SIMP_AVAIL;
999		}
1000	+	else
1001	+	return UPDATE_MNTH_REQD_ERR;
1002		}
1003		try
1004		{
#	Line 975 | Line 1010 | int GetUpdateStatus(Install_info_cfg *cu
1010		ModPackage installedPackage, updatePackage;
1011		if (is_directory(install_iter->path()) && exists(install_iter->path().string() + "/Mod_Info.cfg"))
1012		{
978	–	string blah =install_iter->path().string() + "/Mod_Info.cfg";
979	–	string blah2 = "packages/" + install_iter->path().filename() + "/Mod_Info.cfg";
1013		fstream file;
1014		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1015		if (!file.fail())
#	Line 996 | Line 1029 | int GetUpdateStatus(Install_info_cfg *cu
1029		file.close();
1030		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1031		{
1032	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1032	>	if (updatePackage.installerVersion.compare(gInstallerVersion) < 1)
1033		return UPDATE_PKG_AVAIL;
1034		}
1035		}
#	Line 1270 | Line 1303 | bool ProcessInstallerUpdate(Install_info
1303
1304		bool ProcessAEUpdate(Install_info_cfg *currentAE, Install_info_cfg *updateAE, bool *installerJustUpdated)
1305		{
1306	+	try {
1307		fstream file;
1308		string line;
1309		vector<string> tokens, updateStarted;
#	Line 1289 | Line 1323 | bool ProcessAEUpdate(Install_info_cfg *c
1323		string strOniApp = "Oni.exe";
1324		#else
1325		string strOniApp = "Oni.app";
1292	–	#endif
1326		bool needNewTrashDir = false;
1327	+	#endif
1328	+
1329		bool readingVerAndDate = false;
1330
1331		#ifdef WIN32
1332	<	string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
1332	>	//remove readonly attrib from files.
1333	>	setStatusArea("Removing readonly attribute...");
1334	>	system("attrib -r ./* /s");
1335	>	system("attrib -r ../Oni.exe /s");
1336	>	system("attrib -r ../binkw32.dll /s");
1337	>
1338		#else
1339		FILE *fUserName = NULL;
1340		char chrUserName[32];
#	Line 1329 | Line 1369 | bool ProcessAEUpdate(Install_info_cfg *c
1369		if (readingVerAndDate && tokens.capacity() >= 3)
1370		tokenize(tokens[2], updateStarted, "-");
1371		}
1372	+	#ifndef WIN32
1373		if (updateStarted.capacity() < 3)
1374		needNewTrashDir = true;
1375		else
#	Line 1338 | Line 1379 | bool ProcessAEUpdate(Install_info_cfg *c
1379		if (!exists(strTrashDir))
1380		needNewTrashDir = true;
1381		}
1382	+	#endif
1383		}
1384		#ifndef WIN32
1385		if (!*installerJustUpdated || needNewTrashDir) // prepare a new directory for deleted files to go to
#	Line 1354 | Line 1396 | bool ProcessAEUpdate(Install_info_cfg *c
1396		// Special code to replace our special files -- the Oni app, OniSplit, the Daodan DLL, and the GUI for OniSplit
1397		if (exists(strPathToEUFN + strOniApp))
1398		{
1399	<	if (exists(strOniApp))
1400	<	rename((path)strOniApp, (path)(strTrashDir + strOniApp));
1401	<	rename((path)(strPathToEUFN + strOniApp), (path)strOniApp);
1399	>	if (exists("../" + strOniApp))
1400	>	#ifdef WIN32
1401	>	remove((path)("../" + strOniApp));
1402	>	#else
1403	>	rename((path)("../" + strOniApp), (path)(strTrashDir + strOniApp));
1404	>	#endif
1405	>	rename((path)(strPathToEUFN + strOniApp), (path)("../" + strOniApp));
1406		}
1407		if (updateAE->OniSplitVersion.compare(currentAE->OniSplitVersion) >= 1)
1408		{
1409		if (exists(strPathToEUFNInstall + strOniSplit))
1410		{
1411		if (exists(strOniSplit))
1412	+	#ifdef WIN32
1413	+	remove((path)strOniSplit);
1414	+	#else
1415		rename((path)strOniSplit, (path)(strTrashDir + strOniSplit));
1416	+	#endif
1417		rename((path)(strPathToEUFNInstall + strOniSplit), (path)strOniSplit);
1418		}
1419		}
#	Line 1373 | Line 1423 | bool ProcessAEUpdate(Install_info_cfg *c
1423		if (exists(strPathToEUFN + strDaodan))
1424		{
1425		if (exists(("../" + strDaodan)))
1426	<	rename((path)("../" + strDaodan), (path)(strTrashDir + strDaodan));
1426	>	remove((path)("../" + strDaodan));
1427		rename((path)(strPathToEUFN + strDaodan), (path)("../" + strDaodan));
1428		}
1429		}
#	Line 1382 | Line 1432 | bool ProcessAEUpdate(Install_info_cfg *c
1432		if (exists(strPathToEUFNInstall + strWinGUI))
1433		{
1434		if (exists((path)strWinGUI))
1435	<	rename((path)strWinGUI, (path)(strTrashDir + strWinGUI));
1435	>	remove((path)strWinGUI);
1436		if (exists(strWinGUILang))
1437	<	rename((path)strWinGUILang, (path)(strTrashDir + strWinGUILang));
1437	>	remove((path)strWinGUILang);
1438		rename((path)(strPathToEUFNInstall + strWinGUI), (path)strWinGUI);
1439		rename((path)(strPathToEUFNInstall + strWinGUILang), (path)strWinGUILang);
1440		}
#	Line 1417 | Line 1467 | bool ProcessAEUpdate(Install_info_cfg *c
1467		while (curPos != string::npos && curPos < thePath.size())
1468		{
1469		aParentPath = aParentPath + thePath.substr(lastPos, curPos - lastPos);
1470	+	#ifndef WIN32
1471		if (!exists(strTrashDir + aParentPath))
1472		create_directory(strTrashDir + aParentPath);
1473	+	#endif
1474		lastPos = curPos + 1;
1475		curPos = thePath.find("/", lastPos);
1476		aParentPath = aParentPath + "/";
#	Line 1426 | Line 1478 | bool ProcessAEUpdate(Install_info_cfg *c
1478		#ifndef WIN32
1479		rename((path)("../" + thePath), (path)(strTrashDir + thePath));
1480		#else
1481	<	remove((path)("../" + thePath));
1481	>	remove_all((path)("../" + thePath));
1482		#endif
1483		}
1484		}
1485
1486		ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1487
1488	<	// 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...
1489	<	// ...and folders which do not exist in the current AE will be created there
1490	<	vector<string> foldersToMake, filesToMove;
1491	<	string thePath;
1488	>	// 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...
1489	>	// ...create_directories() function
1490	>	string strPath;
1491	>	path thePath;
1492		for (recursive_directory_iterator dir_itr(strPathToEUFNPackages + strGlobalize), end_itr; dir_itr != end_itr; ++dir_itr)
1493		{
1494	<	thePath = dir_itr->path().string();
1495	<	MakePathLocalToGlobalize(&thePath);
1494	>	strPath = dir_itr->path().string();
1495	>	MakePathLocalToGlobalize(&strPath);
1496	>	thePath = (path)strPath;
1497		if (is_regular_file(dir_itr->status()))
1498		{
1499	<	if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1500	<	filesToMove.push_back(thePath);
1501	<	}
1502	<	else if (is_directory(dir_itr->status()))
1503	<	{
1504	<	if (!exists(strPathToPackages + strGlobalize + thePath))
1505	<	foldersToMake.push_back(thePath);
1499	>	if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1500	>	{
1501	>	if (exists(strPathToPackages + strGlobalize + strPath))
1502	>	{
1503	>	#ifdef WIN32
1504	>	remove((path)(strPathToPackages + strGlobalize + strPath));
1505	>	#else
1506	>	create_directories((path)(strTrashDir + thePath.parent_path().string()));
1507	>	rename((path)(strPathToPackages + strGlobalize + strPath), (path)(strTrashDir + strPath));
1508	>	#endif
1509	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1510	>	}
1511	>	else
1512	>	{
1513	>	int slashLoc = 0;
1514	>	slashLoc = strPath.find("/", 0);
1515	>	if (slashLoc != string::npos) // then path contains slashes, so we need to make sure its parents' paths exist before moving it
1516	>	create_directories((path)(strPathToPackages + strGlobalize + thePath.parent_path().string()));
1517	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1518	>	}
1519	>	}
1520		}
1521		}
1455	–	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1456	–	// ...before folder 'parent/child/'"?
1457	–	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1458	–	// First make the folders that don't exist in the current AE, so all the files have a place to go
1459	–	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1460	–	{
1461	–	create_directory(strPathToPackages + strGlobalize + *iter);
1462	–	}
1463	–	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1464	–	{
1465	–	if (exists(strPathToPackages + strGlobalize + *iter))
1466	–	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1467	–	rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1468	–	}
1522
1523		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
1524	+	#ifdef WIN32
1525	+	remove_all((path)strPathToEUFN);
1526	+	#else
1527		create_directory(strTrashDir + "Unneeded update files");
1528		rename((path)strPathToEUFN, (path)(strTrashDir + "Unneeded update files/" + strEUFN));
1529	<
1529	>	#endif
1530		// Write to log that we are finished with update
1531		ptime end_time(second_clock::local_time());
1532		string progressMsg2 = "Edition was updated to:\n" +
#	Line 1488 | Line 1544 | bool ProcessAEUpdate(Install_info_cfg *c
1544		CheckForGlobalization(true); // the 'true' value forces re-globalization
1545
1546		globalPackages = getPackages(); // refresh the list in memory
1547	<	// TODO: Refresh the packages list in the window
1548	<
1547	>	wxCommandEvent e;
1548	>	TheWindow->OnRefreshButtonClick( e );
1549		return true;
1550	+	}
1551	+	catch (exception & ex)
1552	+	{
1553	+	wxMessageDialog* DotNetDialogOfDeath =
1554	+	new wxMessageDialog(TheWindow, ex.what(), "AE Installer Alert",
1555	+	wxICON_EXCLAMATION     , wxDefaultPosition);
1556	+
1557	+	DotNetDialogOfDeath->ShowModal();
1558	+	setStatusArea("Warning, handled exception: " + (string)ex.what());
1559	+	return false;
1560	+	}
1561		}
1562	<	extern MainWindow* TheWindow;
1562	>
1563		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
1564		{
1565		ptime startTime(second_clock::local_time());
#	Line 1549 | Line 1616 | void ProcessPackageUpdates(string pathTo
1616		file.close();
1617		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1618		{
1619	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1619	>	if (updatePackage.installerVersion.compare(gInstallerVersion) < 1)
1620		{
1621		if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1622		#ifdef WIN32
#	Line 1622 | Line 1689 | void tokenize(const string& str, vector<
1689
1690		/* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
1691		|  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
1692	<	\  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
1692	>	\  some extra return characters into strings.                                                                                    */
1693		void StripNewlines(string *theLine)
1694		{
1695		int deleteFromHere = 0;
#	Line 1675 | Line 1742 | void copy( const path & from_ph,
1742
1743		}
1744		else if(from_ph.filename() != ".svn")
1745	<	{
1746	<	path destination;
1747	<	if(!exists(to_ph))
1748	<	{
1749	<	destination=to_ph;
1750	<	}
1751	<	else
1752	<	{
1753	<	destination=to_ph/from_ph.filename();
1754	<	}
1745	>	{
1746	>	path destination;
1747	>	if(!exists(to_ph))
1748	>	{
1749	>	destination=to_ph;
1750	>	}
1751	>	else
1752	>	{
1753	>	destination=to_ph/from_ph.filename();
1754	>	}
1755
1756	<	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1756	>	for(directory_iterator i(from_ph); i!=directory_iterator(); ++i)
1757		{
1758		//the idiot who coded this in the first place (not me)
1759		//forgot to make a new directory. Exception city. x_x
1760	<	create_directory(destination);
1761	<	copy(*i,destination/i->filename());
1760	>	create_directory(destination);
1761	>	copy(*i, destination/i->filename());
1762		}
1763		}
1764		}

Diff Legend

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