Author: mkrueger
Date: 2007-10-12 05:18:16 -0400 (Fri, 12 Oct 2007)
New Revision: 87388
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpMSBuildProjectExtension.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/Extras/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/Utils.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/VBNetMSBuildProjectExtension.cs
Log:
* CSharpResourceIdBuilder.cs, VBNetMSBuildProjectExtension.cs,
CSharpMSBuildProjectExtension.cs,
DefaultMSBuildProjectExtension.cs, Utils.cs, SlnFileFormat.cs,
MSBuildFileFormat.cs: Applied changes that were neccassary for to
the new FileService.
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpMSBuildProjectExtension.cs
===================================================================
---
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpMSBuildProjectExtension.cs
2007-10-12 09:17:12 UTC (rev 87387)
+++
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpMSBuildProjectExtension.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -128,12 +128,12 @@
Utils.EnsureChildValue (configElement, "WarningLevel",
csparams.WarningLevel);
if (csparams.Win32Icon != null &&
csparams.Win32Icon.Length > 0)
Utils.EnsureChildValue (configElement,
"ApplicationIcon",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
csparams.Win32Icon)));
if (csparams.Win32Resource != null &&
csparams.Win32Resource.Length > 0)
Utils.EnsureChildValue (configElement,
"Win32Resource",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
csparams.Win32Resource)));
}
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
2007-10-12 09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -45,7 +45,7 @@
if (pf.IsExternalToProject)
fname = Path.GetFileName (fname);
else
- fname =
Runtime.FileService.NormalizeRelativePath (fname);
+ fname =
FileService.NormalizeRelativePath (fname);
if (String.Compare (Path.GetExtension (fname),
".resx", true) == 0) {
fname = Path.ChangeExtension (fname,
".resources");
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-10-12
09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-10-12
09:18:16 UTC (rev 87388)
@@ -1,3 +1,10 @@
+2007-10-12 Mike Krüger <[EMAIL PROTECTED]>
+
+ * CSharpResourceIdBuilder.cs, VBNetMSBuildProjectExtension.cs,
+ CSharpMSBuildProjectExtension.cs, DefaultMSBuildProjectExtension.cs,
+ Utils.cs, SlnFileFormat.cs, MSBuildFileFormat.cs: Applied changes that
+ were neccassary for to the new FileService.
+
2007-10-09 Ankit Jain <[EMAIL PROTECTED]>
* CSharpResourceIdBuilder.cs: Handle localized resources.
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
===================================================================
---
trunk/monodevelop/Extras/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
2007-10-12 09:17:12 UTC (rev 87387)
+++
trunk/monodevelop/Extras/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -282,7 +282,7 @@
Utils.EnsureChildValue (configElement, "AssemblyName",
Utils.CanonicalizePath (config.OutputAssembly));
// VS2005 emits trailing \\ for folders
Utils.EnsureChildValue (configElement, "OutputPath",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
config.OutputDirectory)) + "\\");
Utils.EnsureChildValue (configElement, "DebugSymbols",
config.DebugMode);
}
@@ -359,7 +359,7 @@
Utils.RemoveChild (elem,
"DependentUpon");
} else {
Utils.EnsureChildValue (elem,
"DependentUpon",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
Path.GetDirectoryName
(projectFile.Name), projectFile.DependsOn)));
}
}
@@ -423,7 +423,7 @@
}
Utils.EnsureChildValue (elem, "HintPath",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (project.BaseDirectory,
projectRef.Reference)));
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (project.BaseDirectory,
projectRef.Reference)));
Utils.EnsureChildValue (elem,
"SpecificVersion", "False");
break;
case ReferenceType.Project:
@@ -442,7 +442,7 @@
return elem;
}
- reference = Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ reference = Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
p.FileName));
if (p.ExtendedProperties.Contains
(typeof (MSBuildFileFormat))) {
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-10-12 09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -583,7 +583,7 @@
string dir = Path.GetDirectoryName (oldfname);
string newfname = Path.Combine (dir, e.NewName + extn);
- Runtime.FileService.MoveFile (oldfname, newfname);
+ FileService.MoveFile (oldfname, newfname);
e.CombineEntry.FileName = newfname;
}
@@ -709,7 +709,7 @@
//DependentUpon is relative to the basedir of the 'pf'
(resource file)
if (!String.IsNullOrEmpty (e.ProjectFile.DependsOn))
Utils.EnsureChildValue (d.ProjectFileElements
[e.ProjectFile], "DependentUpon",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(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
2007-10-12 09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/SlnFileFormat.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -237,7 +237,7 @@
writer.WriteLine (@"Project(""{0}"") =
""{1}"", ""{2}"", ""{3}""",
MSBuildFileFormat.ProjectTypeGuids [project.LanguageName],
project.Name,
-
Runtime.FileService.NormalizeRelativePath
(Runtime.FileService.AbsoluteToRelativePath (
+
FileService.NormalizeRelativePath (FileService.AbsoluteToRelativePath (
baseDirectory,
project.FileName)).Replace ('/', '\\'),
msbData.Guid);
} else {
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/Utils.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/Utils.cs 2007-10-12
09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/Utils.cs 2007-10-12
09:18:16 UTC (rev 87388)
@@ -245,7 +245,7 @@
if (String.IsNullOrEmpty (path))
return path;
- string ret = Runtime.FileService.NormalizeRelativePath
(path);
+ string ret = FileService.NormalizeRelativePath (path);
if (ret.Length == 0)
return ".";
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/VBNetMSBuildProjectExtension.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/VBNetMSBuildProjectExtension.cs
2007-10-12 09:17:12 UTC (rev 87387)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/VBNetMSBuildProjectExtension.cs
2007-10-12 09:18:16 UTC (rev 87388)
@@ -164,12 +164,12 @@
Utils.EnsureChildValue (configElement, "OptionStrict",
vbparams.OptionStrict ? "On" : "Off");
if (vbparams.Win32Icon != null &&
vbparams.Win32Icon.Length > 0)
Utils.EnsureChildValue (configElement,
"ApplicationIcon",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
vbparams.Win32Icon)));
if (vbparams.Win32Resource != null &&
vbparams.Win32Resource.Length > 0)
Utils.EnsureChildValue (configElement,
"Win32Resource",
- Utils.CanonicalizePath
(Runtime.FileService.AbsoluteToRelativePath (
+ Utils.CanonicalizePath
(FileService.AbsoluteToRelativePath (
project.BaseDirectory,
vbparams.Win32Resource)));
//FIXME: VB.net Imports
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
