Subversion Repositories spk

Rev

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

Rev 39 Rev 50
Line 1062... Line 1062...
1062
			CyString sFile = CyStringFromSystemString(file);
1062
			CyString sFile = CyStringFromSystemString(file);
1063
			CyStringList malformed, unknown;
1063
			CyStringList malformed, unknown;
1064
			CBaseFile *package = m_pPackages->LoadPackagerScript(sFile, -1, NULL, &malformed, &unknown);
1064
			CBaseFile *package = m_pPackages->LoadPackagerScript(sFile, -1, NULL, &malformed, &unknown);
1065
			if ( package )
1065
			if ( package )
1066
			{
1066
			{
1067
				CyString saveto = package->GetFilename();
1067
				CyString saveto = package->filename();
1068
				saveto = saveto.FindReplace("$DEFAULTDIR", CFileIO(sFile).GetDir() + "/");
1068
				saveto = saveto.FindReplace("$DEFAULTDIR", CFileIO(sFile).GetDir() + "/");
1069
				saveto = saveto.FindReplace("$PATH", CFileIO(sFile).GetDir());
1069
				saveto = saveto.FindReplace("$PATH", CFileIO(sFile).GetDir());
1070
				saveto = saveto.FindReplace("\\", "/");
1070
				saveto = saveto.FindReplace("\\", "/");
1071
				saveto = saveto.FindReplace("//", "/");
1071
				saveto = saveto.FindReplace("//", "/");
1072
				if ( !saveto.Right(4).Compare(".spk") && package->GetType() != TYPE_XSP )
1072
				if ( !saveto.Right(4).Compare(".spk") && package->GetType() != TYPE_XSP )
Line 1076... Line 1076...
1076
				// write script
1076
				// write script
1077
				if ( package->WriteFile(saveto) ) {
1077
				if ( package->WriteFile(saveto) ) {
1078
					String ^message = "Package: " + SystemStringFromCyString(saveto) + " has been created\n";
1078
					String ^message = "Package: " + SystemStringFromCyString(saveto) + " has been created\n";
1079
					if ( package->AutoGenerateUpdateFile() )
1079
					if ( package->AutoGenerateUpdateFile() )
1080
						package->CreateUpdateFile(CFileIO(saveto).GetDir());
1080
						package->CreateUpdateFile(CFileIO(saveto).GetDir());
1081
					CyString exportto = package->GetExportFilename();
1081
					CyString exportto = package->exportFilename();
1082
					if ( !exportto.Empty() ) {
1082
					if ( !exportto.Empty() ) {
1083
						exportto = exportto.FindReplace("$DEFAULTDIR", CFileIO(sFile).GetDir() + "/");
1083
						exportto = exportto.FindReplace("$DEFAULTDIR", CFileIO(sFile).GetDir() + "/");
1084
						exportto = exportto.FindReplace("$PATH", CFileIO(sFile).GetDir());
1084
						exportto = exportto.FindReplace("$PATH", CFileIO(sFile).GetDir());
1085
						exportto = exportto.FindReplace("\\", "/");
1085
						exportto = exportto.FindReplace("\\", "/");
1086
						exportto = exportto.FindReplace("//", "/");
1086
						exportto = exportto.FindReplace("//", "/");
Line 1111... Line 1111...
1111
			CBaseFile *package = m_pPackages->LoadPackagerScript(CyStringFromSystemString(file), SPKCOMPRESS_NONE, NULL, &malformed, &unknown);
1111
			CBaseFile *package = m_pPackages->LoadPackagerScript(CyStringFromSystemString(file), SPKCOMPRESS_NONE, NULL, &malformed, &unknown);
1112
			if ( package )
1112
			if ( package )
1113
			{
1113
			{
1114
				package->SetDataCompression(SPKCOMPRESS_7ZIP);
1114
				package->SetDataCompression(SPKCOMPRESS_7ZIP);
1115
				PackageForm ^childForm = this->OpenPackage(true, package, file, "");
1115
				PackageForm ^childForm = this->OpenPackage(true, package, file, "");
1116
				childForm->Text = SystemStringFromCyString(package->GetFilename());
1116
				childForm->Text = _US(package->filename());
1117
			}
1117
			}
1118
		}
1118
		}
1119
		void OpenPackagerScript()
1119
		void OpenPackagerScript()
1120
		{
1120
		{
1121
			OpenFileDialog ^ofd = gcnew OpenFileDialog();
1121
			OpenFileDialog ^ofd = gcnew OpenFileDialog();
Line 1343... Line 1343...
1343
				{
1343
				{
1344
					CXspFile *shipFile = new CXspFile;
1344
					CXspFile *shipFile = new CXspFile;
1345
					loaded = shipFile->ConvertOld(_S(file));
1345
					loaded = shipFile->ConvertOld(_S(file));
1346
					if ( loaded )
1346
					if ( loaded )
1347
					{
1347
					{
1348
						shipFile->SetChanged(true);
1348
						shipFile->adjustChanged(true);
1349
						shipFile->SetFilename(_S(file));
1349
						shipFile->setFilename(_S(file));
1350
						convertFile = shipFile;
1350
						convertFile = shipFile;
1351
					}
1351
					}
1352
					else 
1352
					else 
1353
						delete shipFile;
1353
						delete shipFile;
1354
				}
1354
				}
1355
				else if ( String::Compare(IO::FileInfo(file).Extension, ".spk") == 0 )
1355
				else if ( String::Compare(IO::FileInfo(file).Extension, ".spk") == 0 )
1356
				{
1356
				{
1357
					CSpkFile *spkFile = CSpkFile::convertFromOld(CyStringFromSystemString(file).ToString());
1357
					CSpkFile *spkFile = CSpkFile::convertFromOld(CyStringFromSystemString(file).ToString());
1358
					if ( spkFile ) {
1358
					if ( spkFile ) {
1359
						loaded = true;
1359
						loaded = true;
1360
						spkFile->SetChanged(true);
1360
						spkFile->adjustChanged(true);
1361
						spkFile->SetFilename(CyStringFromSystemString(file));
1361
						spkFile->setFilename(_S(file));
1362
						convertFile = spkFile;
1362
						convertFile = spkFile;
1363
					}
1363
					}
1364
				}
1364
				}
1365
 
1365
 
1366
				if ( !loaded )
1366
				if ( !loaded )
Line 1392... Line 1392...
1392
				{
1392
				{
1393
					loaded = true;
1393
					loaded = true;
1394
					PackageForm ^childForm = this->OpenPackage(display, package, file, "");
1394
					PackageForm ^childForm = this->OpenPackage(display, package, file, "");
1395
					if ( convertFile )
1395
					if ( convertFile )
1396
					{
1396
					{
1397
						convertFile->SetChanged(true);
1397
						convertFile->adjustChanged(true);
1398
						childForm->UpdateChanged();
1398
						childForm->UpdateChanged();
1399
					}
1399
					}
1400
				}
1400
				}
1401
			}
1401
			}
1402
 
1402
 
Line 2598... Line 2598...
2598
			 if ( !m_pConverted )
2598
			 if ( !m_pConverted )
2599
				MessageBox::Show(this, "Unable to open archive file, " + m_sConvertFile, "Unable to open", MessageBoxButtons::OK, MessageBoxIcon::Error);
2599
				MessageBox::Show(this, "Unable to open archive file, " + m_sConvertFile, "Unable to open", MessageBoxButtons::OK, MessageBoxIcon::Error);
2600
			 else
2600
			 else
2601
			 {
2601
			 {
2602
				PackageForm ^childForm = this->OpenPackage(true, m_pConverted, m_sConvertFile, "");
2602
				PackageForm ^childForm = this->OpenPackage(true, m_pConverted, m_sConvertFile, "");
2603
				childForm->Text = SystemStringFromCyString(m_pConverted->GetFilename());
2603
				childForm->Text = _US(m_pConverted->filename());
2604
			 }
2604
			 }
2605
		 }
2605
		 }
2606
private: System::Void generatePackageUpdatesToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
2606
private: System::Void generatePackageUpdatesToolStripMenuItem_Click(System::Object^  sender, System::EventArgs^  e) {
2607
			 GeneratePackageUpdates();
2607
			 GeneratePackageUpdates();
2608
		 }
2608
		 }