Subversion Repositories spk

Rev

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

Rev 158 Rev 160
Line 249... Line 249...
249 
	}
 249 
	}
250 
	fclose ( id );
 250 
	fclose ( id );
251 
 
 251 
 
252 
	// check its not a new format already
 252 
	// check its not a new format already
253 
	int check = CSpkFile::CheckFile ( filename );
 253 
	int check = CSpkFile::CheckFile ( filename );
254 
	if ( check == SPKFILE_INVALID && CFileIO(filename).CheckFileExtension("xsp") )
 254 
	if ( check == SPKFILE_INVALID && CFileIO(filename).isFileExtension("xsp") )
255 
	{
 255 
	{
256 
		printf ( "* Converting XSP File, %s... ", filename.c_str() );
 256 
		printf ( "* Converting XSP File, %s... ", filename.c_str() );
257 
		CXspFile xspFile;
 257 
		CXspFile xspFile;
258 
		if ( !xspFile.ConvertOld(filename.ToString()) )
 258 
		if ( !xspFile.ConvertOld(filename.ToString()) )
259 
		{
 259 
		{
Line 456... Line 456...
456 
			return;
 456 
			return;
457 
		}
 457 
		}
458 
		read = true;
 458 
		read = true;
459 
	}
 459 
	}
460 
	// otherwise its an old ship file
 460 
	// otherwise its an old ship file
461 
	else if ( CFileIO(filename).CheckFileExtension("xsp") )
 461 
	else if ( CFileIO(filename).isFileExtension("xsp") )
462 
	{
 462 
	{
463 
		printf ( "* Converting XSP File, %s...\n", filename.c_str() );
 463 
		printf ( "* Converting XSP File, %s...\n", filename.c_str() );
464 
		pBaseFile = new CXspFile;
 464 
		pBaseFile = new CXspFile;
465 
		if ( !((CXspFile *)pBaseFile)->ConvertOld(filename) )
 465 
		if ( !((CXspFile *)pBaseFile)->ConvertOld(filename) )
466 
		{
 466 
		{
Line 1140... Line 1140...
1140 
			return;
 1140 
			return;
1141 
		}
 1141 
		}
1142 
 
 1142 
 
1143 
		// creates the directory so it can be extracted
 1143 
		// creates the directory so it can be extracted
1144 
		CDirIO Dir(dir);
 1144 
		CDirIO Dir(dir);
1145 
		if ( !Dir.Create(f->GetDirectory(pBaseFile)) )
 1145 
		if ( !Dir.create(f->getDirectory(pBaseFile)) )
1146 
		{
 1146 
		{
1147 
			printf ( "Unable to create the directory \"%s\" to extract into\n", dir.c_str() );
 1147 
			printf ( "Unable to create the directory \"%s\" to extract into\n", dir.c_str() );
1148 
			return;
 1148 
			return;
1149 
		}
 1149 
		}
1150 
 
 1150 
 
Line 1427... Line 1427...
1427 
		printf("Error: Unable to generate packager script\n");
 1427 
		printf("Error: Unable to generate packager script\n");
1428 
		return;
 1428 
		return;
1429 
	}
 1429 
	}
1430 
 
 1430 
 
1431 
	if ( toFile.Empty() )
 1431 
	if ( toFile.Empty() )
1432 
		toFile = CFileIO(spkfile).GetDirIO().File(package->name() + "_" + package->author() + ".sps");
 1432 
		toFile = CFileIO(spkfile).GetDirIO().file(package->name() + "_" + package->author() + ".sps");
1433 
 
 1433 
 
1434 
	// save package file
 1434 
	// save package file
1435 
	if ( CFileIO(toFile).writeFile(&list) )
 1435 
	if ( CFileIO(toFile).writeFile(&list) )
1436 
		printf("Packager script, %s, has been geenrated\n", toFile.c_str());
 1436 
		printf("Packager script, %s, has been geenrated\n", toFile.c_str());
1437 
	else
 1437 
	else