Author: lluis
Date: 2006-12-17 12:41:37 -0500 (Sun, 17 Dec 2006)
New Revision: 69620

Modified:
   trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
   trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
   trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs
   trunk/monodevelop/Extras/prj2make-sharp-lib/prj2make-sharp-lib.mdp
Log:
* prj2make-sharp-lib.mdp: Added missing files.
* SlnFileFormat.cs, MSBuildFileFormat.cs: Track changes in the
  FileService class.

Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog       2006-12-17 
17:40:36 UTC (rev 69619)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog       2006-12-17 
17:41:37 UTC (rev 69620)
@@ -1,3 +1,9 @@
+2006-12-17  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * prj2make-sharp-lib.mdp: Added missing files.
+       * SlnFileFormat.cs, MSBuildFileFormat.cs: Track changes in the
+         FileService class.
+
 2006-12-15  Ankit Jain  <[EMAIL PROTECTED]>
 
        * IResourceIdBuilder.cs: New.

Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs    
2006-12-17 17:40:36 UTC (rev 69619)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs    
2006-12-17 17:41:37 UTC (rev 69620)
@@ -117,15 +117,15 @@
                                        WriteFileInternal (file, project, 
monitor);
                                } else {
                                        WriteFileInternal (tmpfilename, 
project, monitor);
-                                       File.Delete (file);
-                                       File.Move (tmpfilename, file);
+                                       Runtime.FileService.DeleteFile (file);
+                                       Runtime.FileService.MoveFile 
(tmpfilename, file);
                                }
                        } catch (Exception ex) {
                                monitor.ReportError (GettextCatalog.GetString 
("Could not save project: {0}", file), ex);
                                Console.WriteLine ("Could not save project: 
{0}, {1}", file, ex);
 
                                if (tmpfilename != String.Empty)
-                                       File.Delete (tmpfilename);
+                                       Runtime.FileService.DeleteFile 
(tmpfilename);
                                throw;
                        } finally {
                                monitor.EndTask ();
@@ -231,7 +231,7 @@
                                EnsureChildValue (configElement, "OutputType", 
ns, config.CompileTarget);
                                EnsureChildValue (configElement, 
"AssemblyName", ns, config.OutputAssembly);
                                EnsureChildValue (configElement, "OutputPath", 
ns, 
-                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, 
config.OutputDirectory));
+                                       
Runtime.FileService.AbsoluteToRelativePath (project.BaseDirectory, 
config.OutputDirectory));
                                EnsureChildValue (configElement, 
"DebugSymbols", ns, config.DebugMode);
 
                                if (project.LanguageName == "VBNet") {
@@ -248,12 +248,12 @@
                                        EnsureChildValue (configElement, 
"OptionStrict", ns, vbparams.OptionStrict);
                                        if (vbparams.Win32Icon != null && 
vbparams.Win32Icon.Length > 0)
                                                EnsureChildValue 
(configElement, "ApplicationIcon", ns,
-                                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                                       
Runtime.FileService.AbsoluteToRelativePath (
                                                                
project.BaseDirectory, vbparams.Win32Icon));
 
                                        if (vbparams.Win32Resource != null && 
vbparams.Win32Resource.Length > 0)
                                                EnsureChildValue 
(configElement, "Win32Resource", ns,
-                                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                                       
Runtime.FileService.AbsoluteToRelativePath (
                                                                
project.BaseDirectory, vbparams.Win32Resource));
 
                                        //FIXME: VB.net Imports
@@ -270,12 +270,12 @@
                                        EnsureChildValue (configElement, 
"WarningLevel", ns, csparams.WarningLevel);
                                        if (csparams.Win32Icon != null && 
csparams.Win32Icon.Length > 0)
                                                EnsureChildValue 
(configElement, "ApplicationIcon", ns,
-                                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                                       
Runtime.FileService.AbsoluteToRelativePath (
                                                                
project.BaseDirectory, csparams.Win32Icon));
 
                                        if (csparams.Win32Resource != null && 
csparams.Win32Resource.Length > 0)
                                                EnsureChildValue 
(configElement, "Win32Resource", ns,
-                                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                                       
Runtime.FileService.AbsoluteToRelativePath (
                                                                
project.BaseDirectory, csparams.Win32Resource));
                                }
                        }
@@ -476,7 +476,7 @@
                        string dir = Path.GetDirectoryName (oldfname);
                        string newfname = Path.Combine (dir, e.NewName + extn);
 
-                       File.Move (oldfname, newfname);
+                       Runtime.FileService.MoveFile (oldfname, newfname);
                        e.CombineEntry.FileName = newfname;
                }
 
@@ -553,7 +553,7 @@
                                reference = 
Mono.Cecil.AssemblyFactory.GetAssembly (reference).Name.ToString ();
 
                                AppendChild (elem, "HintPath", ns, 
-                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, 
projectRef.Reference));
+                                       
Runtime.FileService.AbsoluteToRelativePath (project.BaseDirectory, 
projectRef.Reference));
                                AppendChild (elem, "SpecificVersion", ns, 
"False");
                                break;
                        case ReferenceType.Project:
@@ -561,7 +561,7 @@
                                if (c != null) {
                                        Project p = c.FindProject 
(projectRef.Reference);
                                        //FIXME: if (p == null) : This should 
not happen!
-                                       reference = 
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                       reference = 
Runtime.FileService.AbsoluteToRelativePath (
                                                project.BaseDirectory, 
p.FileName);
 
                                        if (p.ExtendedProperties.Contains 
(typeof (MSBuildFileFormat))) {
@@ -643,7 +643,7 @@
                                
                                //DependentUpon is relative to the basedir of 
the 'pf' (resource file)
                                EnsureChildValue (d.ProjectFileElements 
[projectFile], "DependentUpon", ns,
-                                               
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                               
Runtime.FileService.AbsoluteToRelativePath (
                                                        Path.GetDirectoryName 
(projectFile.Name), projectFile.DependsOn));
                        }
                        
@@ -704,7 +704,7 @@
 
                        //DependentUpon is relative to the basedir of the 'pf' 
(resource file)
                        EnsureChildValue (d.ProjectFileElements 
[e.ProjectFile], "DependentUpon", ns,
-                                       
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                       
Runtime.FileService.AbsoluteToRelativePath (
                                                Path.GetDirectoryName 
(e.ProjectFile.Name), e.ProjectFile.DependsOn));
                        //FIXME: Subtype, Data
                }

Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs        
2006-12-17 17:40:36 UTC (rev 69619)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs        
2006-12-17 17:41:37 UTC (rev 69620)
@@ -93,15 +93,15 @@
                                        WriteFileInternal (file, c, monitor);
                                } else {
                                        WriteFileInternal (tmpfilename, c, 
monitor);
-                                       File.Delete (file);
-                                       File.Move (tmpfilename, file);
+                                       Runtime.FileService.DeleteFile (file);
+                                       Runtime.FileService.MoveFile 
(tmpfilename, file);
                                }
                        } catch (Exception ex) {
                                monitor.ReportError (GettextCatalog.GetString 
("Could not save solution: {0}", file), ex);
                                Console.WriteLine ("Could not save solution: 
{0}, {1}", file, ex);
 
                                if (tmpfilename != String.Empty)
-                                       File.Delete (tmpfilename);
+                                       Runtime.FileService.DeleteFile 
(tmpfilename);
                                throw;
                        } finally {
                                monitor.EndTask ();
@@ -188,7 +188,7 @@
                                        writer.WriteLine 
(@"Project(""{{{0}}}"") = ""{1}"", ""{2}"", ""{{{3}}}""",
                                                projectTypeGuid.ToString 
().ToUpper (),
                                                ce.Name, 
-                                               
Runtime.FileUtilityService.AbsoluteToRelativePath (baseDirectory, ce.FileName),
+                                               
Runtime.FileService.AbsoluteToRelativePath (baseDirectory, ce.FileName),
                                                msbData.Guid);
                                } else {
                                        //Solution
@@ -368,7 +368,7 @@
                                        MSBuildData data = (MSBuildData) 
proj.ExtendedProperties [typeof (MSBuildFileFormat)];
                                        XmlElement elem = 
data.ProjectReferenceElements [pref];
                                        elem.SetAttribute ("Include", 
-                                               
Runtime.FileUtilityService.AbsoluteToRelativePath (
+                                               
Runtime.FileService.AbsoluteToRelativePath (
                                                        proj.BaseDirectory, 
p.FileName));
 
                                        //Set guid of the ProjectReference

Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/prj2make-sharp-lib.mdp
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/prj2make-sharp-lib.mdp  
2006-12-17 17:40:36 UTC (rev 69619)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/prj2make-sharp-lib.mdp  
2006-12-17 17:41:37 UTC (rev 69620)
@@ -27,6 +27,17 @@
     <File name="./csproj_ver2003.cs" subtype="Code" buildaction="Compile" />
     <File name="./prj2make-sharp-lib-Commands.cs" subtype="Code" 
buildaction="Compile" />
     <File name="./prj2make-sharp-lib.addin.xml" subtype="Code" 
buildaction="FileCopy" />
+    <File name="./MSBuildFileFormat.cs" subtype="Code" buildaction="Compile" />
+    <File name="./MSBuildProject.cs" subtype="Code" buildaction="Compile" />
+    <File name="./MSBuildSolution.cs" subtype="Code" buildaction="Compile" />
+    <File name="./MSBuildData.cs" subtype="Code" buildaction="Compile" />
+    <File name="./Makefile.am" subtype="Code" buildaction="Nothing" />
+    <File name="./SlnData.cs" subtype="Code" buildaction="Compile" />
+    <File name="./SlnFileFormat.cs" subtype="Code" buildaction="Compile" />
+    <File name="./VBNetResourceIdBuilder.cs" subtype="Code" 
buildaction="Compile" />
+    <File name="./CSharpResourceIdBuilder.cs" subtype="Code" 
buildaction="Compile" />
+    <File name="./IResourceIdBuilder.cs" subtype="Code" buildaction="Compile" 
/>
+    <File name="./ChangeLog" subtype="Code" buildaction="Nothing" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to