Subversion Repositories spk

Rev

Rev 101 | Rev 116 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 101 Rev 102
Line 1182... Line 1182...
1182
	{
1182
	{
1183
		printf("Error: unable to open package file, %s, Error=%d\n", spkfile.c_str(), error);
1183
		printf("Error: unable to open package file, %s, Error=%d\n", spkfile.c_str(), error);
1184
		return;
1184
		return;
1185
	}
1185
	}
1186
 
1186
 
1187
	CyString file = package->CreateUpdateFile(CFileIO(spkfile).GetDir());
1187
	Utils::String file = package->CreateUpdateFile(CFileIO(spkfile).dir()).ToString();
1188
	if ( file.Empty() )
1188
	if ( file.empty() )
1189
		printf("Error: unable to create update file for: %s, Directory=%s\n", spkfile.c_str(), CFileIO(spkfile).GetDir().c_str());
1189
		printf("Error: unable to create update file for: %s, Directory=%s\n", spkfile.c_str(), CFileIO(spkfile).dir().c_str());
1190
	else
1190
	else
1191
		printf("Update file: %s has been created for package, %s\n", file.c_str(), spkfile.c_str());
1191
		printf("Update file: %s has been created for package, %s\n", file.c_str(), spkfile.c_str());
1192
 
1192
 
1193
	delete package;
1193
	delete package;
1194
 
1194
 
Line 1274... Line 1274...
1274
 
1274
 
1275
	CPackages p;
1275
	CPackages p;
1276
	p.Startup(".", ".", myDoc);
1276
	p.Startup(".", ".", myDoc);
1277
	CyStringList malformed, unknown;
1277
	CyStringList malformed, unknown;
1278
 
1278
 
1279
	CyString curDir = CFileIO(filename).GetDir();
1279
	CyString curDir = CFileIO(filename).dir();
1280
	if ( curDir.Empty() ) curDir = "./";
1280
	if ( curDir.Empty() ) curDir = "./";
1281
 
1281
 
1282
	CyStringList variables;
1282
	CyStringList variables;
1283
	variables.PushBack("$PATH", curDir);
1283
	variables.PushBack("$PATH", curDir);
1284
 
1284
 
Line 1316... Line 1316...
1316
		saveto = saveto.FindReplace("//", "/");
1316
		saveto = saveto.FindReplace("//", "/");
1317
		if ( !saveto.Right(4).Compare(".spk") && package->GetType() != TYPE_XSP )
1317
		if ( !saveto.Right(4).Compare(".spk") && package->GetType() != TYPE_XSP )
1318
			saveto += ".spk";
1318
			saveto += ".spk";
1319
		else if ( !saveto.Right(4).Compare(".xsp") && package->GetType() == TYPE_XSP )
1319
		else if ( !saveto.Right(4).Compare(".xsp") && package->GetType() == TYPE_XSP )
1320
			saveto += ".xsp";
1320
			saveto += ".xsp";
1321
		printf("Saving file to: %s\n", CFileIO(saveto).GetFullFilename().c_str());
1321
		printf("Saving file to: %s\n", CFileIO(saveto).fullFilename().c_str());
1322
		if ( verify )
1322
		if ( verify )
1323
			printf("Package can be created from this script\n");
1323
			printf("Package can be created from this script\n");
1324
		else
1324
		else
1325
		{
1325
		{
1326
			// write script
1326
			// write script
1327
			if ( package->WriteFile(saveto) )
1327
			if ( package->WriteFile(saveto) )
1328
			{
1328
			{
1329
				if ( package->AutoGenerateUpdateFile() )
1329
				if ( package->AutoGenerateUpdateFile() )
1330
					package->CreateUpdateFile(CFileIO(saveto).GetDir());
1330
					package->CreateUpdateFile(CFileIO(saveto).dir());
1331
				printf("Package: %s was created\n", saveto.c_str());
1331
				printf("Package: %s was created\n", saveto.c_str());
1332
			}
1332
			}
1333
			else
1333
			else
1334
				printf("Error! There was a problem writing the package\n");
1334
				printf("Error! There was a problem writing the package\n");
1335
		}
1335
		}
Line 1338... Line 1338...
1338
		if ( !saveto.Empty() ) {
1338
		if ( !saveto.Empty() ) {
1339
			saveto = saveto.FindReplace("$DEFAULTDIR", curDir + "/");
1339
			saveto = saveto.FindReplace("$DEFAULTDIR", curDir + "/");
1340
			saveto = saveto.FindReplace("$PATH", curDir);
1340
			saveto = saveto.FindReplace("$PATH", curDir);
1341
			saveto = saveto.FindReplace("\\", "/");
1341
			saveto = saveto.FindReplace("\\", "/");
1342
			saveto = saveto.FindReplace("//", "/");
1342
			saveto = saveto.FindReplace("//", "/");
1343
			printf("Exporting file to: %s\n", CFileIO(saveto).GetFullFilename().c_str());
1343
			printf("Exporting file to: %s\n", CFileIO(saveto).fullFilename().c_str());
1344
			if ( verify )
1344
			if ( verify )
1345
				printf("Package can be exported from this script\n");
1345
				printf("Package can be exported from this script\n");
1346
			else
1346
			else
1347
			{
1347
			{
1348
				// export
1348
				// export
1349
				if ( package->SaveToArchive(saveto, 0) ) {
1349
				if ( package->SaveToArchive(saveto, 0) ) {
1350
					if ( package->IsAnyGameInPackage() ) {
1350
					if ( package->IsAnyGameInPackage() ) {
1351
						for ( int i = 0; i < p.GetGameExe()->GetNumGames(); i++ ) {
1351
						for ( int i = 0; i < p.GetGameExe()->GetNumGames(); i++ ) {
1352
							if ( package->IsGameInPackage(i + 1) ) {								
1352
							if ( package->IsGameInPackage(i + 1) ) {								
1353
								CyString exportFile = CFileIO(saveto).GetDir() + "/" + CFileIO(saveto).baseName() + "_" + CBaseFile::ConvertGameToString(i + 1) + "." + CFileIO(saveto).GetFileExtension();
1353
								Utils::String exportFile = CFileIO(saveto).dir() + "/" + CFileIO(saveto).baseName() + "_" + CBaseFile::ConvertGameToString(i + 1) + "." + CFileIO(saveto).extension();
1354
								package->SaveToArchive(exportFile, i + 1);
1354
								package->SaveToArchive(exportFile, i + 1);
1355
							}
1355
							}
1356
						}
1356
						}
1357
					}
1357
					}
1358
					printf("Package: %s was exported\n", saveto.c_str());
1358
					printf("Package: %s was exported\n", saveto.c_str());