Author: mkrueger
Date: 2007-05-16 04:20:49 -0400 (Wed, 16 May 2007)
New Revision: 77457

Modified:
   
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Projects/MSBuildProject.cs
   branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
Log:
Worked on msbuild loading routines.

Modified: 
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Projects/MSBuildProject.cs
===================================================================
--- 
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Projects/MSBuildProject.cs
   2007-05-16 06:38:28 UTC (rev 77456)
+++ 
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Projects/MSBuildProject.cs
   2007-05-16 08:20:49 UTC (rev 77457)
@@ -40,9 +40,11 @@
 {
        public class MSBuildProject : IProject
        {
+
                string            fileName;
+               List<string>      imports = new List<string> ();
                List<ProjectItem> items   = new List<ProjectItem> ();
-               List<string>      imports = new List<string> ();
+               List<PropertyGroup> propertyGroups = new List<PropertyGroup> ();
                
                public string FileName {
                        get {
@@ -73,6 +75,12 @@
                        }
                }
                
+               public List<PropertyGroup> PropertyGroups {
+                       get {
+                               return this.propertyGroups;
+                       }
+               }
+               
                public MSBuildProject (string fileName)
                {
                        this.fileName = fileName;
@@ -121,13 +129,71 @@
                }
 
 #region I/O
-               void ReadPropertyGroup (XmlReader reader)
+               
+               class Property
                {
-                       ProjectReadHelper.ReadList (reader, "PropertyGroup", 
delegate() {
-                               return true;
-                       });
+                       string name;
+                       string value;
+                       Dictionary<string, string> attributes = new 
Dictionary<string, string> ();
+                       
+                       public string Name {
+                               get { return name; }
+                               set { name = value; }
+                       }
+                       public string Value {
+                               get { return this.value; }
+                               set { this.value = value; }
+                       }
+                       public Dictionary<string, string> Attributes {
+                               get { return this.attributes; }
+                       }
+                       
+                       public static Property Read (XmlReader reader)
+                       {
+                               Property result = new Property ();
+                               result.Name = reader.LocalName;
+                               for (int i = 0; i < reader.AttributeCount; ++i) 
{
+                                       reader.MoveToAttribute (i);
+                                       result.Attributes[reader.LocalName] = 
reader.Value;
+                               }
+                               reader.MoveToElement();
+                               result.Value = reader.Value;
+                               Console.WriteLine (result.Name + " --" + 
result.Value);
+                               return result;
+                       }
+                       
                }
                
+               class PropertyGroup
+               {
+                       string condition;
+                       List<Property> properties = new List<Property> ();
+                       
+                       public string Condition {
+                               get { return condition; }
+                               set { condition = value; }
+                       }
+                       
+                       public List<Property> Properties {
+                               get { return properties; }
+                       }
+                       
+                       public PropertyGroup (string condition)
+                       {
+                               this.condition = condtion;
+                       }
+                       
+                       public static PropertyGroup Read (XmlReader reader)
+                       {
+                               PropertyGroup result = new PropertyGroup 
(reader.GetAttribute("Condition"));
+                               ProjectReadHelper.ReadList (reader, 
"PropertyGroup", delegate() {
+                                       result.Properties.Add (Property.Read 
(reader));
+                                       return true;
+                               });
+                               return result;
+                       }
+               }
+               
                void ReadItemGroup (XmlReader reader)
                {
                        ProjectReadHelper.ReadList (reader, "ItemGroup", 
delegate() {
@@ -155,7 +221,7 @@
                                                // Root node
                                                return true;
                                        case "PropertyGroup":
-                                               result.ReadPropertyGroup 
(reader);
+                                               
result.PropertyGroups.Add(PropertyGroup.Read (reader));
                                                return true;
                                        case "ItemGroup":
                                                result.ReadItemGroup (reader);

Modified: 
branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp
===================================================================
--- branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp  
2007-05-16 06:38:28 UTC (rev 77456)
+++ branches/mkrueger/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.mdp  
2007-05-16 08:20:49 UTC (rev 77457)
@@ -265,7 +265,6 @@
     <File name="./gtk-gui/gui.stetic" subtype="Code" 
buildaction="EmbedAsResource" />
     <File 
name="./MonoDevelop.Ide.Gui.Pads.ProjectPad/UnknownEntryNodeBuilder.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Gui.Pads/TreeViewItem.cs" subtype="Code" 
buildaction="Compile" />
-    <File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Gui.Dialogs/OpenFileInSolutionDialog.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Gui.Content/TextEditorExtension.cs" 
subtype="Code" buildaction="Compile" />
     <File name="./MonoDevelop.Ide.Gui/TextEditor.cs" subtype="Code" 
buildaction="Compile" />
@@ -356,9 +355,6 @@
     <ProjectReference type="Assembly" localcopy="True" 
refto="../../../contrib/Mono.Addins.Setup.dll" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../../">
-    <ExcludedFiles>
-      <File>./AssemblyInfo.cs</File>
-    </ExcludedFiles>
     <BuildFilesVar Sync="True" Name="FILES" />
     <DeployFilesVar />
     <ResourcesVar Sync="True" Name="RES" />
@@ -368,7 +364,7 @@
     <ProjectRefVar Sync="True" Name="REFS" Prefix="-r:" />
   </MonoDevelop.Autotools.MakefileInfo>
   <Deployment.LinuxDeployData scriptName="monodevelop.ide" />
-  <GtkDesignInfo partialTypes="True">
+  <GtkDesignInfo partialTypes="True" isWidgetLibrary="True">
     <ExportedWidgets>
       <Widget>MonoDevelop.Ide.Gui.Dialogs.CombineEntryFeatureSelector</Widget>
     </ExportedWidgets>

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

Reply via email to