ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/AE/Installer/trunk/source/installer.cpp

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 507 by gumby, Sat Apr 24 17:41:46 2010 UTC vs.
Revision 562 by gumby, Sun May 30 17:28:34 2010 UTC

#	Line 27 | Line 27 | using namespace boost::posix_time;
27		// externs declared in installer.h
28		string strInstallCfg = "../GameDataFolder/Add.cfg";
29		string strEUFN = "Edition"; // GetUpdateStatus() may set this to "Edition-patch" later, but this is the assumed name of the new Edition folder in Updates/
30	+	extern MainWindow* TheWindow;
31
32		int globalizeData(void)
33		{
#	Line 309 | Line 310 | int globalizeData(void)
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/ (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	–	*/
313		string prefsCommand = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '"
314		+ fullAEpath + "'";
315		system(prefsCommand.c_str());
#	Line 394 | Line 390 | ModPackage fileToModPackage(fstream &fil
390		const string GlobalNeeded = "GlobalNeeded";
391		const string Category = "Category";
392		const string Creator = "Creator";
397	–	package.modStringName = modName;
393		while (!file.eof())
394		{
395		getline(file,line);
#	Line 425 | Line 420 | ModPackage fileToModPackage(fstream &fil
420		iter++;
421		package.modStringVersion = atof((*iter).c_str());
422		}
423	<	else if (!ModString.compare(*iter))
423	>	else if (!ModVersion.compare(*iter))
424		{
425		iter++; iter++;
426		package.modStringVersion = atof((*iter).c_str());
#	Line 496 | Line 491 | ModPackage fileToModPackage(fstream &fil
491		}
492		}
493		}
494	<
494	>	package.modStringName = modName;
495		return package;
496		}
497
#	Line 596 | Line 591 | void recompileAll(vector<string> install
591		else if(splitInstances == false){
592		directory_iterator end_iter;
593
594	<	for ( directory_iterator dir_itr( vanilla_dir );
595	<	dir_itr != end_iter;
596	<	++dir_itr )
597	<	{
598	<	if ( is_directory( dir_itr->status() ) )
599	<	{
600	<	numberOfDats++;
594	>
595	>	char levelnums[256] = {0};
596	>
597	>
598	>
599	>	for(int k = 0; k < 256; k++) {
600	>	if( exists( (path)("./VanillaDats/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
601	>	levelnums[k] = 1;
602	>
603		}
604		}
605	<
605	>
606	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
607	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
608	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
609	>	for(int k = 0; k < 256; k++) {
610	>	if( globalPackages[j].hasOnis &&
611	>	exists( (path)("packages/" + globalPackages[j].modStringName + "/oni/level" + lexical_cast<std::string>(k) + "_final/") ) ) {
612	>	levelnums[k] = 1;
613	>
614	>	}
615	>	}
616	>	}
617	>	}
618	>	}
619	>	for (int levelnum = 0; levelnum < 256; levelnum++)
620	>	if (levelnums[levelnum])
621	>	numberOfDats++;
622	>
623		out << numberOfDats;
624		datString = out.str();
625	<
626	<	for ( directory_iterator dir_itr( vanilla_dir );
613	<	dir_itr != end_iter;
614	<	++dir_itr )
615	<	{
625	>
626	>	for(int levelnum = 0; levelnum < 256; levelnum++) {
627		try
628		{
629	<	if ( is_directory( dir_itr->status() ) )
629	>	if ( levelnums[levelnum] )
630		{
631	<	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + dir_itr->path().filename() + " ";
631	>	importCommand = strOniSplit + " " + strImportOption + " " + vanilla_dir.string() + "level" + lexical_cast<std::string>(levelnum) + "_Final ";
632		for (unsigned int i = 0; i < installedMods.size(); ++i) {
633	<	if (exists("packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename()  ))
634	<	importCommand += " packages/" + installedMods[i] + "/oni/" + dir_itr->path().filename();
633	>	if (exists((path)("packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_final") ))
634	>	importCommand += " packages/" + installedMods[i] + "/oni/level" + lexical_cast<std::string>(levelnum) + "_Final";
635		}
636	<	importCommand += " ../GameDataFolder/" + dir_itr->path().filename() + ".dat >> Install.log";
636	>	importCommand += " ../GameDataFolder/level" + lexical_cast<std::string>(levelnum) + "_Final.dat >> Install.log";
637
638		setProgressBar( (int)(1000 * (float)(j-1) / (float)numberOfDats) ); //100% * dat we're on / total dats
639		setStatusArea("Step " + lexical_cast<std::string>(j) + '/' + lexical_cast<std::string>(numberOfDats)+ ": Importing " +
640	<	dir_itr->path().filename() + " ");
640	>	"level" + lexical_cast<std::string>(levelnum) + "_Final"+ " ");
641		system(importCommand.c_str());
642		j++;
643		}
#	Line 646 | Line 657 | void recompileAll(vector<string> install
657		vector<string> skippedfolders;
658
659		ofstream BSLlog("BSL.log");
660	+	if(!exists("../GameDataFolder/BSLBackup/")) {
661	+	create_directory("../GameDataFolder/BSLBackup/");
662	+	copy("../GameDataFolder/IGMD/", "../GameDataFolder/BSLBackup/");
663	+	}
664	+
665		for ( directory_iterator dir_itr( "../GameDataFolder/IGMD/" ), end_itr;
666		dir_itr != end_itr;
667		++dir_itr ) {
#	Line 658 | Line 674 | void recompileAll(vector<string> install
674		for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
675		for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
676		if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
677	<	if(!(globalPackages[j].hasAddon || globalPackages[j].hasBSL)) break; //skip non-BSL
677	>	if(globalPackages[j].hasBSL) break; //skip non-BSL
678		if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
679		copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
680		BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
#	Line 667 | Line 683 | void recompileAll(vector<string> install
683		}
684		}
685
686	+
687	+
688		ModPackage emptyPackage;
689		emptyPackage.modStringName = "VanillaBSL";
690		emptyPackage.hasBSL = 1;
691		copyBSL("packages/VanillaBSL/IGMD", BSLfolders, emptyPackage);
692		BSLlog.close();
693	<
693	>
694	>	for (int i = installedMods.size() - 1; i >= 0; i--) {                                                   //Iterates through the installed mods (backwards :P)
695	>	for (unsigned int j = 0; j < globalPackages.size(); ++j) {                              //looking in the global packages
696	>	if (globalPackages[j].modStringName == installedMods[i]) {      //for a mod that has BSL in it
697	>	if(!globalPackages[j].hasAddon) break; //skip non-BSL
698	>	if( exists( "packages/" + globalPackages[j].modStringName + "/BSL/" ) ) {
699	>	copyBSL("packages/" + globalPackages[j].modStringName + "/BSL", BSLfolders, globalPackages[j] );
700	>	BSLlog << "Copied " <<  globalPackages[j].modStringName << "!\n";
701	>	}
702	>	}
703	>	}
704	>	}
705	>
706		logfile << "Writing config file";
707		writeInstalledMods(installedMods);
708		setProgressBar(1000);
#	Line 713 | Line 743 | void copyBSL(string copypath, vector<str
743		if ( is_directory( dir_itr->path() ) && dir_itr->path().string() != ".svn" ) {
744		BSLlog << "Testing " << dir_itr->path().string() << " HasBSL: " << pkg.hasBSL << " HasAddon: " << pkg.hasAddon << "\n";
745		int skip_folder = 0;
746	<
747	<	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
748	<	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
749	<	if(dir_itr->path().filename() == BSLfolders[k]) {
750	<	skip_folder = 1;
751	<	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
752	<	break;
746	>	if(!pkg.hasAddon) {
747	>	for(unsigned int k = 0; k < BSLfolders.size(); k++)             {//iterate through already found BSL folders
748	>	BSLlog << "testing " << dir_itr->path().filename() << " vs " << BSLfolders[k] << "\n";
749	>	if(dir_itr->path().filename() == BSLfolders[k]) {
750	>	skip_folder = 1;
751	>	BSLlog << "skipping " << BSLfolders[k] << " in " << pkg.modStringName << "\n";
752	>	break;
753	>	}
754		}
755		}
756		if (!skip_folder && !exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/ignore.txt")) {
757	<	remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
757	>	if(!pkg.hasAddon) remove_all( "../GameDataFolder/IGMD/" + dir_itr->path().filename() );
758		Sleep(100);
759		create_directory( "../GameDataFolder/IGMD/" + dir_itr->path().filename());
760		BSLlog << "Copied " << dir_itr->path().string() << " in " << pkg.modStringName << "!\n";
#	Line 731 | Line 762 | void copyBSL(string copypath, vector<str
762		bsl_itr != end_itr;
763		bsl_itr++ ) {
764		if ( bsl_itr->path().extension() == ".bsl" ) {
765	+	if(exists("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename()))
766	+	remove("../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
767		copy_file(bsl_itr->path(),  "../GameDataFolder/IGMD/" + dir_itr->path().filename() + "/" + bsl_itr->path().filename());
768		}
769		}
770	<	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
771	<	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
770	>	if( !pkg.hasAddon ) {
771	>	BSLfolders.push_back( dir_itr->path().filename() ); //add back check for addon
772	>	BSLlog << "Pushing " << dir_itr->path().filename() << "\n" ;
773	>	}
774		}
775		}
776		}
#	Line 841 | Line 876 | int GetUpdateStatus(Install_info_cfg *cu
876		return UPDATE_LOG_READ_ERR;
877		}
878
879	<	// Is there an update folder, and is it a monthly release or a patch?
879	>	// Is there an update in the updates/ folder, and is it a monthly release or a patch?
880		bool firstParty = 0;
881	+	// First create the folder if it's missing, so users are never left wondering where updates are supposed to be put
882	+	if (!exists("../updates"))
883	+	create_directory("../updates");
884		if (exists("../updates/Edition"))
885		{
886		firstParty = 1;
#	Line 945 | Line 983 | int GetUpdateStatus(Install_info_cfg *cu
983		return UPDATE_LOG_READ_ERR;
984		}
985
986	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
986	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
987		{
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	–	}
988		string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
989		string installerVersion = INSTALLER_VERSION;
990		if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
#	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 978 | Line 1013 | int GetUpdateStatus(Install_info_cfg *cu
1013		fstream file;
1014		file.open((install_iter->path().string() + "/Mod_Info.cfg").c_str());
1015		if (!file.fail())
1016	<	ModPackage updatePackage = fileToModPackage(file, install_iter->path().filename());
1016	>	updatePackage = fileToModPackage(file, install_iter->path().filename());
1017		else
1018		{
1019		file.close();
1020		continue;
1021		}
1022	<	if (exists("packages" + install_iter->path().filename() + "/Mod_Info.cfg"))
1022	>	if (exists("packages/" + install_iter->path().filename() + "/Mod_Info.cfg"))
1023		{
1024		file.close();
1025	<	file.open(("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1025	>	file.clear();
1026	>	file.open(("packages/" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1027		if (!file.fail())
1028	<	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
1028	>	installedPackage = fileToModPackage(file, install_iter->path().filename());
1029		file.close();
1030		if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1031		{
#	Line 1004 | Line 1040 | int GetUpdateStatus(Install_info_cfg *cu
1040		}
1041		}
1042		}
1007	–	else
1008	–	{
1009	–	file.close();
1010	–	continue;
1011	–	}
1012	–	file.close();
1013	–
1014	–	file.open( ("packages" + install_iter->path().filename() + "/Mod_Info.cfg").c_str());
1015	–	if (!file.fail())
1016	–	{
1017	–	ModPackage installedPackage = fileToModPackage(file, install_iter->path().filename());
1018	–	}
1019	–	else
1020	–	{
1021	–	file.close();
1022	–	return UPDATE_THIRD_PARTY;
1023	–	}
1024	–	file.close();
1025	–	if(((string)INSTALLER_VERSION).compare(updatePackage.installerVersion) < 1 && updatePackage.modStringVersion > installedPackage.modStringVersion) {
1026	–	return UPDATE_THIRD_PARTY;
1027	–	}
1043		}
1044		}
1045		catch (exception & ex) {
#	Line 1044 | Line 1059 | bool ReadInstallInfoCfg(fstream *fileHan
1059		string strDaodanVersion = "Daodan_Version";
1060		string strOniSplitVersion = "OniSplit_Version";
1061		string strGUIWinVersion = "GUI_Win_Version";
1062	<	string strGUIMacVersion = "GUI_Mac_Version";
1062	>	string strGUIMacVersion = "GUI_Mac_Version";
1063		string strReglobalize = "Reglobalize";
1064		string strDeleteList = "Delete_List";
1065		string strArrow = "->";
#	Line 1286 | Line 1301 | bool ProcessInstallerUpdate(Install_info
1301		return true; // returning 'true' tells the Installer to quit itself ASAP so it can be replaced by the process that is now running
1302		}
1303
1289	–
1290	–	void CrawlPackages(string pathToUpdate, string strPathToPackages) {
1291	–	try{
1292	–	directory_iterator end;
1293	–	for ( directory_iterator update_iter( pathToUpdate );
1294	–	update_iter != end;
1295	–	++update_iter )
1296	–	{
1297	–
1298	–	ModPackage installedPackage, updatePackage;
1299	–	string updateStr = update_iter->path().string() + "/Mod_Info.cfg";
1300	–	if ( !boost::iequals(update_iter->path().filename(),"Edition")
1301	–	&& !boost::iequals(update_iter->path().filename(),"Edition-patch")
1302	–	&& is_directory( update_iter->path() )
1303	–	&& exists( update_iter->path().string() + "/Mod_Info.cfg" ) )
1304	–	{
1305	–	bool update = 0;
1306	–	fstream file;
1307	–	file.open( (update_iter->path().string() + "/Mod_Info.cfg").c_str());
1308	–	if (!file.fail())
1309	–	{
1310	–	updatePackage = fileToModPackage(file, update_iter->path().filename());
1311	–	}
1312	–	else
1313	–	{
1314	–	file.close();
1315	–	continue;
1316	–	}
1317	–	file.close();
1318	–	file.clear();
1319	–	if(exists(strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg"))
1320	–	{
1321	–	file.open((strPathToPackages + "/" + update_iter->path().filename() + "/Mod_Info.cfg").c_str());
1322	–	if (!file.fail())
1323	–	{
1324	–	installedPackage = fileToModPackage(file, update_iter->path().filename());
1325	–	file.close();
1326	–	if(updatePackage.modStringVersion > installedPackage.modStringVersion) {
1327	–	update = 1;
1328	–	}
1329	–	}
1330	–	else
1331	–	{
1332	–	file.close();
1333	–	update = 1;
1334	–	}
1335	–	file.close();
1336	–	}
1337	–	else update = 1;
1338	–	if(update) {
1339	–	if(exists((path)(strPathToPackages +  "/" + updatePackage.modStringName)))
1340	–	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1341	–	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1342	–
1343	–	}
1344	–	}
1345	–	}
1346	–	}
1347	–	catch (exception & ex) {
1348	–	//      ex.what();
1349	–	setStatusArea("Warning, handled exception: " + (string)ex.what());
1350	–	}
1351	–	}
1352	–
1353	–
1354	–	bool ProcessThirdPartyUpdates() {
1355	–	CrawlPackages( "../updates",  "./packages");
1356	–	return true;
1357	–	//      globalPackages = getPackages();
1358	–	//      refreshMods(globalInstalledMods);
1359	–	}
1360	–
1361	–
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 1380 | Line 1323 | bool ProcessAEUpdate(Install_info_cfg *c
1323		string strOniApp = "Oni.exe";
1324		#else
1325		string strOniApp = "Oni.app";
1383	–	#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 1420 | 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 1429 | 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 1445 | 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 1464 | 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 1473 | 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 1508 | 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 1517 | 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		}
1546	–	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1547	–	// ...before folder 'parent/child/'"?
1548	–	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1549	–	// First make the folders that don't exist in the current AE, so all the files have a place to go
1550	–	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1551	–	{
1552	–	create_directory(strPathToPackages + strGlobalize + *iter);
1553	–	}
1554	–	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1555	–	{
1556	–	if (exists(strPathToPackages + strGlobalize + *iter))
1557	–	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
1558	–	rename((path)(strPathToEUFNPackages + strGlobalize + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1559	–	}
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 1579 | 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
1563		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
#	Line 1634 | Line 1610 | void ProcessPackageUpdates(string pathTo
1610		if (!file.fail())
1611		{
1612		installedPackage = fileToModPackage(file, updtFolder);
1613	<	file.close();
1614	<	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1615	<	{
1616	<	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1617	<	{
1613	>	}
1614	>	file.close();
1615	>	}
1616	>	file.close();
1617	>	if (updatePackage.modStringVersion > installedPackage.modStringVersion)
1618	>	{
1619	>	if (updatePackage.installerVersion <= INSTALLER_VERSION)
1620	>	{
1621	>	if(exists(strPathToPackages +  "/" + updatePackage.modStringName)) {
1622		#ifdef WIN32
1623	<	remove_all((path)(strPathToPackages +  "/" + installedPackage.modStringName));
1623	>	remove_all((path)(strPathToPackages +  "/" + updatePackage.modStringName));
1624		#else
1625	<	if (needNewTrashDir)
1626	<	{
1627	<	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1628	<	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1629	<	create_directory(strTrashDir);
1630	<	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));
1625	>	if (needNewTrashDir)
1626	>	{
1627	>	strTrashDir = strTrashDir + "Old_packages_" + boost::lexical_cast<string>(tmStartTime.tm_hour) + "-" +
1628	>	boost::lexical_cast<string>(tmStartTime.tm_min) + "-" + boost::lexical_cast<string>(tmStartTime.tm_sec) + "/";
1629	>	create_directory(strTrashDir);
1630	>	needNewTrashDir = false;
1631		}
1632	+	rename((path)(strPathToPackages +  "/" + updatePackage.modStringName), (path)(strTrashDir + updatePackage.modStringName));
1633	+	#endif
1634		}
1635	+	rename((path)(pathToUpdate + "/" + updatePackage.modStringName), (path)(strPathToPackages + "/" + updatePackage.modStringName));
1636		}
1658	–	else
1659	–	file.close();
1637		}
1661	–	file.close();
1662	–	file.clear();
1638		}
1639		}
1640		}
#	Line 1667 | Line 1642 | void ProcessPackageUpdates(string pathTo
1642		{
1643		setStatusArea("Warning, handled exception: " + (string)ex.what());
1644		}
1645	+	wxCommandEvent e;
1646	+	TheWindow->OnRefreshButtonClick( e );
1647		}
1648
1649		/* MakePathLocalToGlobalize is a function used once by ProcessAEUpdate() that takes a file in an        \
#	Line 1765 | 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)