Author: ankit
Date: 2007-03-29 07:50:01 -0500 (Thu, 29 Mar 2007)
New Revision: 75135
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildSolution.cs
Log:
* MSBuildFileFormat.cs: Write out list of files and references in
WriteFile instead of in SaveProject.
* MSBuildSolution.cs: Cannot convert a non-dotnet project.
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-03-29
12:43:42 UTC (rev 75134)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-03-29
12:50:01 UTC (rev 75135)
@@ -1,3 +1,9 @@
+2007-03-29 Ankit Jain <[EMAIL PROTECTED]>
+
+ * MSBuildFileFormat.cs: Write out list of files and references in
+ WriteFile instead of in SaveProject.
+ * MSBuildSolution.cs: Cannot convert a non-dotnet project.
+
2007-03-29 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* VS2003SlnFileFormat.cs, VS2003ProjectFileFormat.cs: VS2003 file
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-03-29 12:43:42 UTC (rev 75134)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-03-29 12:50:01 UTC (rev 75135)
@@ -277,10 +277,26 @@
CleanUpEmptyItemGroups (doc);
if (newdoc) {
+ foreach (ProjectFile pfile in
project.ProjectFiles)
+ data.ProjectFileElements [pfile] =
FileToXmlElement (data, project, pfile);
+
+ foreach (ProjectReference pref in
project.ProjectReferences)
+ data.ProjectReferenceElements [pref] =
ReferenceToXmlElement (data, project, pref);
+
+ XmlElement elem = doc.CreateElement
("Configuration", ns);
+ data.GlobalConfigElement.AppendChild (elem);
+ elem.InnerText = "Debug";
+ elem.SetAttribute ("Condition", "
'$(Configuration)' == '' ");
+
+ elem = doc.CreateElement ("Platform", ns);
+ data.GlobalConfigElement.AppendChild (elem);
+ elem.InnerText = "AnyCPU";
+ elem.SetAttribute ("Condition", " '$(Platform)'
== '' ");
+
//MUST go at the end..
- XmlElement el = doc.CreateElement ("Import",
ns);
- doc.DocumentElement.InsertAfter (el,
doc.DocumentElement.LastChild);
- el.SetAttribute ("Project",
@"$(MSBuildBinPath)\Microsoft.CSharp.Targets");
+ elem = doc.CreateElement ("Import", ns);
+ doc.DocumentElement.InsertAfter (elem,
doc.DocumentElement.LastChild);
+ elem.SetAttribute ("Project",
@"$(MSBuildBinPath)\Microsoft.CSharp.Targets");
}
doc.Save (file);
@@ -344,29 +360,7 @@
public void SaveProject (DotNetProject project,
IProgressMonitor monitor)
{
WriteFile (project.FileName, project, monitor);
-
- MSBuildData d = (MSBuildData)
project.ExtendedProperties [typeof (MSBuildFileFormat)];
- if (d == null)
- throw new Exception (String.Format ("INTERNAL
ERROR: 'data' object not found for {0}", project.Name));
-
- foreach (ProjectFile pfile in project.ProjectFiles)
- d.ProjectFileElements [pfile] =
FileToXmlElement (d, project, pfile);
-
- foreach (ProjectReference pref in
project.ProjectReferences)
- d.ProjectReferenceElements [pref] =
ReferenceToXmlElement (d, project, pref);
-
- XmlElement elem = d.Document.CreateElement
("Configuration", ns);
- d.GlobalConfigElement.AppendChild (elem);
- elem.InnerText = "Debug";
- elem.SetAttribute ("Condition", " '$(Configuration)' ==
'' ");
-
- elem = d.Document.CreateElement ("Platform", ns);
- d.GlobalConfigElement.AppendChild (elem);
- elem.InnerText = "AnyCPU";
- elem.SetAttribute ("Condition", " '$(Platform)' == ''
");
-
SetupHandlers (project);
- d.Document.Save (project.FileName);
}
//Reader
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildSolution.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildSolution.cs
2007-03-29 12:43:42 UTC (rev 75134)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildSolution.cs
2007-03-29 12:50:01 UTC (rev 75135)
@@ -165,9 +165,12 @@
CombineEntry ret = ce;
if (newCombine == null) {
+ DotNetProject project = ce as DotNetProject;
+ if (project == null)
+ return ce;
+
//FIXME: Use MSBuildFileFormat.CanReadFile
instead
if (String.Compare (Path.GetExtension
(ce.FileName), ".mdp", true) == 0) {
- DotNetProject project = (DotNetProject)
ce;
MSBuildFileFormat fileFormat = new
MSBuildFileFormat (project.LanguageName);
project.FileFormat = fileFormat;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches