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 550 by gumby, Wed May 26 23:28:22 2010 UTC vs.
Revision 558 by gumby, Sat May 29 19:21:27 2010 UTC

#	Line 310 | 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)
313	–	//bad Iritscen, bad! fixed buffers can cause crashes.
314	–	/*char prefsCommand[300] = "[ -f ~/Library/Preferences/com.godgames.oni.plist ] && defaults write com.godgames.oni RetailInstallationPath -string '";
315	–	strcat(prefsCommand, fullAEpath.c_str());
316	–	strcat(prefsCommand, "'"); // path string is enclosed in single quotes to avoid the need to escape UNIX-unfriendly characters
317	–	*/
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 426 | Line 421 | ModPackage fileToModPackage(fstream &fil
421		iter++;
422		package.modStringVersion = atof((*iter).c_str());
423		}
424	<	else if (!ModString.compare(*iter))
424	>	else if (!ModVersion.compare(*iter))
425		{
426		iter++; iter++;
427		package.modStringVersion = atof((*iter).c_str());
#	Line 597 | 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 );
614	<	dir_itr != end_iter;
615	<	++dir_itr )
616	<	{
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 " +
641	<	dir_itr->path().filename() + " ");
641	>	"level" + lexical_cast<std::string>(levelnum) + "_Final"+ " ");
642		system(importCommand.c_str());
643		j++;
644		}
#	Line 746 | Line 757 | void copyBSL(string copypath, vector<str
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 754 | 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		}
#	Line 973 | Line 986 | int GetUpdateStatus(Install_info_cfg *cu
986		return UPDATE_LOG_READ_ERR;
987		}
988
989	<	if (updateAE->AEVersion.compare(currentAE->AEVersion) >= 1) // is the release update newer than what's installed?
989	>	if (updateAE->AEVersion.compare(currentAE->AEVersion) > 0) // is the release update newer than what's installed?
990		{
978	–	if (!strEUFN.compare("Edition-patch")) // if update is a patch...
979	–	{
980	–	if (currentAE->AEVersion.compare(updateAE->AEVersion.substr(0, updateAE->AEVersion.length() - 1))) // ...is it for a different month?
981	–	return UPDATE_MNTH_REQD_ERR;
982	–	}
991		string strNewInstallerPath = "../updates/" + strEUFN + "/install/" + strInstallerName;
992		string installerVersion = INSTALLER_VERSION;
993		if (updateAE->InstallerVersion.compare(installerVersion) >= 1)
#	Line 992 | Line 1000 | int GetUpdateStatus(Install_info_cfg *cu
1000		else
1001		return UPDATE_SIMP_AVAIL;
1002		}
1003	+	else
1004	+	return UPDATE_MNTH_REQD_ERR;
1005		}
1006		try
1007		{
#	Line 1322 | Line 1332 | bool ProcessAEUpdate(Install_info_cfg *c
1332		bool readingVerAndDate = false;
1333
1334		#ifdef WIN32
1335	<	//string strTrashDir = "Trash\\"; // string unused in Windows because files are simply deleted
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 1473 | Line 1488 | bool ProcessAEUpdate(Install_info_cfg *c
1488
1489		ProcessPackageUpdates(strPathToEUFNPackages, strPathToPackages);
1490
1491	<	// 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...
1492	<	// ...and folders which do not exist in the current AE will be created there
1493	<	vector<string> foldersToMake, filesToMove;
1494	<	string thePath;
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	<	thePath = dir_itr->path().string();
1498	<	MakePathLocalToGlobalize(&thePath);
1497	>	strPath = dir_itr->path().string();
1498	>	MakePathLocalToGlobalize(&strPath);
1499	>	thePath = (path)strPath;
1500		if (is_regular_file(dir_itr->status()))
1501		{
1502	<	if (dir_itr->filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1503	<	filesToMove.push_back(thePath);
1504	<	}
1505	<	else if (is_directory(dir_itr->status()))
1490	<	{
1491	<	if (!exists(strPathToPackages + strGlobalize + thePath))
1492	<	foldersToMake.push_back(thePath);
1493	<	}
1494	<	}
1495	<	// Sort the foldersToMake strings by length, which is a fast solution to the problem of "How do we make sure we create folder 'parent/'...
1496	<	// ...before folder 'parent/child/'"?
1497	<	sort(foldersToMake.begin(), foldersToMake.end(), SortBySize); // SortBySize is a custom comparison function found later in this source file
1498	<	// First make the folders that don't exist in the current AE, so all the files have a place to go
1499	<	for (vector<string>::iterator iter = foldersToMake.begin(); iter != foldersToMake.end(); iter++)
1500	<	{
1501	<	create_directory(strPathToPackages + strGlobalize + *iter);
1502	<	}
1503	<	for (vector<string>::iterator iter = filesToMove.begin(); iter != filesToMove.end(); iter++)
1504	<	{
1505	<	if (exists(strPathToPackages + strGlobalize + *iter))
1502	>	if (thePath.filename().at(0) != '.') // skip over dot-files, which are invisible in Unix
1503	>	{
1504	>	if (exists(strPathToPackages + strGlobalize + strPath))
1505	>	{
1506		#ifdef WIN32
1507	<	remove((path)(strPathToPackages + strGlobalize + *iter));
1507	>	remove((path)(strPathToPackages + strGlobalize + strPath));
1508		#else
1509	<	rename((path)(strPathToPackages + strGlobalize + *iter), (path)(strTrashDir + *iter));
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 + *iter), (path)(strPathToPackages + strGlobalize + *iter));
1512	>	rename((path)(strPathToEUFNPackages + strGlobalize + strPath), (path)(strPathToPackages + strGlobalize + strPath));
1513	>	}
1514	>	else
1515	>	{
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	>	}
1524		}
1525
1526		// Clean up after ourselves, trashing any packages or programs in the update package that are not newer than the current AE
#	Line 1544 | Line 1556 | bool ProcessAEUpdate(Install_info_cfg *c
1556		setStatusArea("Warning, handled exception: " + (string)ex.what());
1557		return false;
1558		}
1547	–
1559		}
1560
1561		void ProcessPackageUpdates(string pathToUpdate, string strPathToPackages)
#	Line 1729 | 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		}

Diff Legend

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