Author: lluis
Date: 2007-03-29 07:04:40 -0500 (Thu, 29 Mar 2007)
New Revision: 75130
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectConvertTool.cs
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/FileFormatManager.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdsFileFormat.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
Log:
* MonoDevelop.Projects/ProjectService.cs: Track api changes.
* MonoDevelop.Projects/FileFormatManager.cs: Allow getting all file
formats supported by a file or object.
* MonoDevelop.Projects/PrjxFileFormat.cs,
MonoDevelop.Projects/MdsFileFormat.cs,
MonoDevelop.Projects/CmbxFileFormat.cs: Set correct file format
name.
* MonoDevelop.Projects/ProjectConvertTool.cs,
MonoDevelop.Projects.addin.xml, MonoDevelop.Projects.mdp,
Makefile.am: Added new project conversion tool.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2007-03-29
11:59:54 UTC (rev 75129)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2007-03-29
12:04:40 UTC (rev 75130)
@@ -1,3 +1,16 @@
+2007-03-29 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Projects/ProjectService.cs: Track api changes.
+ * MonoDevelop.Projects/FileFormatManager.cs: Allow getting all file
+ formats supported by a file or object.
+ * MonoDevelop.Projects/PrjxFileFormat.cs,
+ MonoDevelop.Projects/MdsFileFormat.cs,
+ MonoDevelop.Projects/CmbxFileFormat.cs: Set correct file format
+ name.
+ * MonoDevelop.Projects/ProjectConvertTool.cs,
+ MonoDevelop.Projects.addin.xml, MonoDevelop.Projects.mdp,
+ Makefile.am: Added new project conversion tool.
+
2007-03-26 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects/ProjectService.cs,
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-03-29
11:59:54 UTC (rev 75129)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-03-29
12:04:40 UTC (rev 75130)
@@ -230,6 +230,7 @@
MonoDevelop.Projects/NoStartupCombineDefinedException.cs \
MonoDevelop.Projects/PrjxFileFormat.cs \
MonoDevelop.Projects/Project.cs \
+ MonoDevelop.Projects/ProjectConvertTool.cs \
MonoDevelop.Projects/ProjectCreateInformation.cs \
MonoDevelop.Projects/ProjectEventArgs.cs \
MonoDevelop.Projects/ProjectFile.cs \
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CmbxFileFormat.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -38,7 +38,7 @@
internal class CmbxFileFormat: IFileFormat
{
public string Name {
- get { return "MonoDevelop Combine"; }
+ get { return "SharpDevelop 1.0 Combine"; }
}
public string GetValidFormatName (string fileName)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/FileFormatManager.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/FileFormatManager.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/FileFormatManager.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -41,20 +41,22 @@
fileFormats.Add (format);
}
- public IFileFormat GetFileFormat (string fileName)
+ public IFileFormat[] GetFileFormats (string fileName)
{
+ ArrayList list = new ArrayList ();
foreach (IFileFormat format in fileFormats)
if (format.CanReadFile (fileName))
- return format;
- return null;
+ list.Add (format);
+ return (IFileFormat[]) list.ToArray
(typeof(IFileFormat));
}
- public IFileFormat GetFileFormatForObject (object obj)
+ public IFileFormat[] GetFileFormatsForObject (object obj)
{
+ ArrayList list = new ArrayList ();
foreach (IFileFormat format in fileFormats)
if (format.CanWriteFile (obj))
- return format;
- return null;
+ list.Add (format);
+ return (IFileFormat[]) list.ToArray
(typeof(IFileFormat));
}
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdsFileFormat.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdsFileFormat.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/MdsFileFormat.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -38,7 +38,7 @@
internal class MdsFileFormat: IFileFormat
{
public string Name {
- get { return "MonoDevelop Combine"; }
+ get { return "MonoDevelop Solution"; }
}
public string GetValidFormatName (string fileName)
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/PrjxFileFormat.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -37,7 +37,7 @@
internal class PrjxFileFormat: IFileFormat
{
public string Name {
- get { return "SharpDevelop Project"; }
+ get { return "SharpDevelop 1.0 Project"; }
}
public string GetValidFormatName (string fileName)
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectConvertTool.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectConvertTool.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectConvertTool.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -0,0 +1,79 @@
+
+using System;
+using System.IO;
+using MonoDevelop.Core;
+using MonoDevelop.Core.AddIns;
+using MonoDevelop.Core.ProgressMonitoring;
+
+namespace MonoDevelop.Projects
+{
+ class ProjectConvertTool: IApplication
+ {
+ public int Run (string[] arguments)
+ {
+ if (arguments.Length == 0 || arguments.Length > 2 ||
arguments [0] == "--help") {
+ Console.WriteLine ("Project Conversion Tool");
+ Console.WriteLine ("Usage: mdtool
project-convert <source-project-file> [format name]");
+ return 0;
+ }
+ if (!File.Exists (arguments[0])) {
+ Console.WriteLine ("File {0} not found.",
arguments [0]);
+ return 1;
+ }
+
+ IProgressMonitor monitor = new ConsoleProgressMonitor
();
+ CombineEntry entry =
Services.ProjectService.ReadCombineEntry (arguments [0], monitor);
+ IFileFormat[] formats =
Services.ProjectService.FileFormats.GetFileFormatsForObject (entry);
+
+ if (formats.Length == 0) {
+ Console.WriteLine ("Can't convert file to any
format: " + arguments [0]);
+ return 1;
+ }
+
+ IFileFormat format = null;
+
+ if (arguments.Length == 1) {
+ Console.WriteLine ();
+ Console.WriteLine ("Target formats:");
+ for (int n=0; n<formats.Length; n++)
+ Console.WriteLine (" {0}. {1}", n + 1,
formats [n].Name);
+ Console.WriteLine ();
+
+ int op = 0;
+ do {
+ Console.Write ("Convert to format: ");
+ string s = Console.ReadLine ();
+ if (s.Length == 0)
+ return 1;
+ if (int.TryParse (s, out op)) {
+ if (op > 0 && op <=
formats.Length)
+ break;
+ }
+ } while (true);
+
+ format = formats [op - 1];
+ }
+ else {
+ foreach (IFileFormat f in formats) {
+ if (f.Name == arguments[1])
+ format = f;
+ }
+ if (format == null) {
+ Console.WriteLine ("Invalid file
format: " + arguments [1]);
+ return 1;
+ }
+ }
+
+ entry.FileFormat = format;
+ string file = format.GetValidFormatName (arguments [0]);
+ if (file == arguments [0]) {
+ string ext = Path.GetExtension (arguments [0]);
+ file = file.Substring (0, file.Length -
ext.Length);
+ file += ".converted" + ext;
+ }
+ entry.Save (file, monitor);
+ Console.WriteLine ("Saved file: " + file);
+ return 0;
+ }
+ }
+}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
2007-03-29 12:04:40 UTC (rev 75130)
@@ -64,17 +64,17 @@
internal CombineEntry ReadFile (string file, IProgressMonitor
monitor)
{
- IFileFormat format = formatManager.GetFileFormat (file);
+ IFileFormat[] formats = formatManager.GetFileFormats
(file);
- if (format == null)
+ if (formats.Length == 0)
throw new InvalidOperationException ("Unknown
file format: " + file);
- CombineEntry obj = format.ReadFile (file, monitor) as
CombineEntry;
+ CombineEntry obj = formats[0].ReadFile (file, monitor)
as CombineEntry;
if (obj == null)
throw new InvalidOperationException ("Invalid
file format: " + file);
if (obj.FileFormat == null)
- obj.FileFormat = format;
+ obj.FileFormat = formats[0];
return obj;
}
@@ -83,9 +83,14 @@
{
IFileFormat format = entry.FileFormat;
if (format == null) {
- if (entry is Project) format =
defaultProjectFormat;
- else if (entry is Combine) format =
defaultCombineFormat;
- else format =
formatManager.GetFileFormatForObject (entry);
+ if (entry is Project)
+ format = defaultProjectFormat;
+ else if (entry is Combine)
+ format = defaultCombineFormat;
+ else {
+ IFileFormat[] formats =
formatManager.GetFileFormatsForObject (entry);
+ format = formats.Length > 0 ? formats
[0] : null;
+ }
if (format == null)
throw new InvalidOperationException
("FileFormat not provided for combine entry '" + entry.Name + "'");
@@ -135,8 +140,7 @@
if (filename.StartsWith ("file://"))
filename = new Uri(filename).LocalPath;
- IFileFormat format = formatManager.GetFileFormat
(filename);
- return format != null;
+ return formatManager.GetFileFormats (filename).Length >
0;
}
public override void InitializeService()
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2007-03-29 11:59:54 UTC (rev 75129)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2007-03-29 12:04:40 UTC (rev 75130)
@@ -34,6 +34,7 @@
<Extension path = "/Workspace/Applications">
<Class id = "build" class = "MonoDevelop.Projects.BuildTool"
description = "Project build tool"/>
<Class id = "dbgen" class =
"MonoDevelop.Projects.Parser.DatabaseGeneratorTool" description = "Parser
database generation tool"/>
+ <Class id = "project-convert" class =
"MonoDevelop.Projects.ProjectConvertTool" description = "Project conversion
tool"/>
</Extension>
<Extension path = "/SharpDevelop/Workbench/Ambiences"
extension-nodes="Class" description="Language ambiences.|Specified classes must
implement IAmbience.">
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2007-03-29 11:59:54 UTC (rev 75129)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2007-03-29 12:04:40 UTC (rev 75130)
@@ -252,6 +252,7 @@
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
<File name="./MonoDevelop.Projects.dll.config" subtype="Code"
buildaction="FileCopy" />
<File name="./MonoDevelop.Projects/CustomCommandExtension.cs"
subtype="Code" buildaction="Compile" />
+ <File name="./MonoDevelop.Projects/ProjectConvertTool.cs" subtype="Code"
buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="False" refto="monodoc,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches