Merge pull request #926 from ermshiperete/novell-bug-674098
[mono.git] / mcs / class / Microsoft.Build / Microsoft.Build.Evaluation / Project.cs
index 772a905b9156c6fd30a7906547ea1c1113e2dfb0..4f7fbd168ce50eaec7965274a649ac78f697af20 100644 (file)
@@ -41,6 +41,7 @@ using Microsoft.Build.Exceptions;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Internal;
+using Microsoft.Build.Internal.Expressions;
 using Microsoft.Build.Logging;
 using System.Collections;
 
@@ -130,18 +131,7 @@ namespace Microsoft.Build.Evaluation
                        this.ProjectCollection = projectCollection;
                        this.load_settings = loadSettings;
 
-                       Initialize (null);
-               }
-               
-               Project (ProjectRootElement imported, Project parent)
-               {
-                       this.Xml = imported;
-                       this.GlobalProperties = parent.GlobalProperties;
-                       this.ToolsVersion = parent.ToolsVersion;
-                       this.ProjectCollection = parent.ProjectCollection;
-                       this.load_settings = parent.load_settings;
-
-                       Initialize (parent);
+                       Initialize ();
                }
 
                public Project (string projectFile)
@@ -186,7 +176,7 @@ namespace Microsoft.Build.Evaluation
                List<ProjectProperty> properties;
                Dictionary<string, ProjectTargetInstance> targets;
 
-               void Initialize (Project parent)
+               void Initialize ()
                {
                        dir_path = Directory.GetCurrentDirectory ();
                        raw_imports = new List<ResolvedImport> ();
@@ -194,31 +184,27 @@ namespace Microsoft.Build.Evaluation
                        targets = new Dictionary<string, ProjectTargetInstance> ();
                        raw_items = new List<ProjectItem> ();
                        
-                       // FIXME: this is likely hack. Test ImportedProject.Properties to see what exactly should happen.
-                       if (parent != null) {
-                               properties = parent.properties;
-                       } else {
-                               properties = new List<ProjectProperty> ();
-                       
-                               foreach (DictionaryEntry p in Environment.GetEnvironmentVariables ())
+                       properties = new List<ProjectProperty> ();
+               
+                       foreach (DictionaryEntry p in Environment.GetEnvironmentVariables ())
+                               // FIXME: this is kind of workaround for unavoidable issue that PLATFORM=* is actually given
+                               // on some platforms and that prevents setting default "PLATFORM=AnyCPU" property.
+                               if (!string.Equals ("PLATFORM", (string) p.Key, StringComparison.OrdinalIgnoreCase))
                                        this.properties.Add (new EnvironmentProjectProperty (this, (string)p.Key, (string)p.Value));
-                               foreach (var p in GlobalProperties)
-                                       this.properties.Add (new GlobalProjectProperty (this, p.Key, p.Value));
-                               var tools = ProjectCollection.GetToolset (this.ToolsVersion) ?? ProjectCollection.GetToolset (this.ProjectCollection.DefaultToolsVersion);
-                               foreach (var p in ProjectCollection.GetReservedProperties (tools, this))
-                                       this.properties.Add (p);
-                               foreach (var p in ProjectCollection.GetWellKnownProperties (this))
-                                       this.properties.Add (p);
-                       }
-
-                       ProcessXml (parent);
+                       foreach (var p in GlobalProperties)
+                               this.properties.Add (new GlobalProjectProperty (this, p.Key, p.Value));
+                       var tools = ProjectCollection.GetToolset (this.ToolsVersion) ?? ProjectCollection.GetToolset (this.ProjectCollection.DefaultToolsVersion);
+                       foreach (var p in ProjectCollection.GetReservedProperties (tools, this))
+                               this.properties.Add (p);
+                       foreach (var p in ProjectCollection.GetWellKnownProperties (this))
+                               this.properties.Add (p);
+
+                       ProcessXml ();
                        
                        ProjectCollection.AddProject (this);
                }
                
-               static readonly char [] item_sep = {';'};
-               
-               void ProcessXml (Project parent)
+               void ProcessXml ()
                {
                        // this needs to be initialized here (regardless of that items won't be evaluated at property evaluation;
                        // Conditions could incorrectly reference items and lack of this list causes NRE.
@@ -234,7 +220,7 @@ namespace Microsoft.Build.Evaluation
                        EvaluateItems (elements);
                        
                        // finally, evaluate targets and tasks
-                       EvaluateTasks (elements);
+                       EvaluateTargets (elements);
                }
                
                IEnumerable<ProjectElement> EvaluatePropertiesAndImports (IEnumerable<ProjectElement> elements)
@@ -253,8 +239,9 @@ namespace Microsoft.Build.Evaluation
                                var ige = child as ProjectImportGroupElement;
                                if (ige != null && Evaluate (ige.Condition)) {
                                        foreach (var incc in ige.Imports) {
-                                               foreach (var e in Import (incc))
-                                                       yield return e;
+                                               if (Evaluate (incc.Condition))
+                                                       foreach (var e in Import (incc))
+                                                               yield return e;
                                        }
                                }
                                var inc = child as ProjectImportElement;
@@ -263,6 +250,12 @@ namespace Microsoft.Build.Evaluation
                                                yield return e;
                        }
                }
+               
+               internal IEnumerable<T> GetAllItems<T> (string include, string exclude, Func<string,T> creator, Func<string,ITaskItem> taskItemCreator, Func<string,bool> itemTypeCheck, Action<T,string> assignRecurse)
+               {
+                       return ProjectCollection.GetAllItems<T> (ExpandString, include, exclude, creator, taskItemCreator, DirectoryPath, assignRecurse,
+                               t => all_evaluated_items.Any (i => i.EvaluatedInclude == t.ItemSpec && itemTypeCheck (i.ItemType)));
+               }
 
                void EvaluateItems (IEnumerable<ProjectElement> elements)
                {
@@ -272,33 +265,10 @@ namespace Microsoft.Build.Evaluation
                                        foreach (var p in ige.Items) {
                                                if (!Evaluate (ige.Condition) || !Evaluate (p.Condition))
                                                        continue;
-                                               var includes = ExpandString (p.Include).Split (item_sep, StringSplitOptions.RemoveEmptyEntries);
-                                               var excludes = ExpandString (p.Exclude).Split (item_sep, StringSplitOptions.RemoveEmptyEntries);
-                                               
-                                               if (includes.Length == 0)
-                                                       continue;                                               
-                                               if (includes.Length == 1 && includes [0].IndexOf ('*') < 0 && excludes.Length == 0) {
-                                                       // for most case - shortcut.
-                                                       var item = new ProjectItem (this, p, includes [0]);
-                                                       this.raw_items.Add (item);
+                                               Func<string,ProjectItem> creator = s => new ProjectItem (this, p, s);
+                                               foreach (var item in GetAllItems<ProjectItem> (p.Include, p.Exclude, creator, s => new ProjectTaskItem (p, s), it => string.Equals (it, p.ItemType, StringComparison.OrdinalIgnoreCase), (t, s) => t.RecursiveDir = s)) {
+                                                       raw_items.Add (item);
                                                        all_evaluated_items.Add (item);
-                                               } else {
-                                                       var ds = new Microsoft.Build.BuildEngine.DirectoryScanner () {
-                                                               BaseDirectory = new DirectoryInfo (DirectoryPath),
-                                                               Includes = includes.Select (i => new ProjectTaskItem (p, i)).ToArray (),
-                                                               Excludes = excludes.Select (e => new ProjectTaskItem (p, e)).ToArray (),
-                                                       };
-                                                       ds.Scan ();
-                                                       foreach (var taskItem in ds.MatchedItems) {
-                                                               if (all_evaluated_items.Any (i => i.EvaluatedInclude == taskItem.ItemSpec && i.ItemType == p.ItemType))
-                                                                       continue; // skip duplicate
-                                                               var item = new ProjectItem (this, p, taskItem.ItemSpec);
-                                                               string recurse = taskItem.GetMetadata ("RecursiveDir");
-                                                               if (!string.IsNullOrEmpty (recurse))
-                                                                       item.RecursiveDir = recurse;
-                                                               this.raw_items.Add (item);
-                                                               all_evaluated_items.Add (item);
-                                                       }
                                                }
                                        }
                                }
@@ -317,19 +287,20 @@ namespace Microsoft.Build.Evaluation
                        all_evaluated_items.Sort ((p1, p2) => string.Compare (p1.ItemType, p2.ItemType, StringComparison.OrdinalIgnoreCase));
                }
                
-               void EvaluateTasks (IEnumerable<ProjectElement> elements)
+               void EvaluateTargets (IEnumerable<ProjectElement> elements)
                {
                        foreach (var child in elements) {
                                var te = child as ProjectTargetElement;
                                if (te != null)
-                                       this.targets.Add (te.Name, new ProjectTargetInstance (te));
+                                       // It overwrites same name target.
+                                       this.targets [te.Name] = new ProjectTargetInstance (te);
                        }
                }
                
                IEnumerable<ProjectElement> Import (ProjectImportElement import)
                {
                        string dir = ProjectCollection.GetEvaluationTimeThisFileDirectory (() => FullPath);
-                       string path = WindowsCompatibilityExtensions.NormalizeFilePath (ExpandString (import.Project));
+                       string path = WindowsCompatibilityExtensions.FindMatchingPath (ExpandString (import.Project));
                        path = Path.IsPathRooted (path) ? path : dir != null ? Path.Combine (dir, path) : Path.GetFullPath (path);
                        if (ProjectCollection.OngoingImports.Contains (path)) {
                                switch (load_settings) {
@@ -457,17 +428,12 @@ namespace Microsoft.Build.Evaluation
                
                bool Evaluate (string unexpandedValue)
                {
-                       return string.IsNullOrWhiteSpace (unexpandedValue) || new ExpressionEvaluator (this, null).EvaluateAsBoolean (unexpandedValue);
+                       return string.IsNullOrWhiteSpace (unexpandedValue) || new ExpressionEvaluator (this).EvaluateAsBoolean (unexpandedValue);
                }
 
                public string ExpandString (string unexpandedValue)
                {
-                       return ExpandString (unexpandedValue, null);
-               }
-               
-               string ExpandString (string unexpandedValue, string replacementForMissingStuff)
-               {
-                       return new ExpressionEvaluator (this, replacementForMissingStuff).Evaluate (unexpandedValue);
+                       return WindowsCompatibilityExtensions.NormalizeFilePath (new ExpressionEvaluator (this).Evaluate (unexpandedValue));
                }
 
                public static string GetEvaluatedItemIncludeEscaped (ProjectItem item)
@@ -503,13 +469,13 @@ namespace Microsoft.Build.Evaluation
 
                public static string GetMetadataValueEscaped (ProjectItem item, string name)
                {
-                       var md = item.GetMetadata (name);
+                       var md = item.Metadata.FirstOrDefault (m => m.Name.Equals (name, StringComparison.OrdinalIgnoreCase));
                        return md != null ? ProjectCollection.Escape (md.EvaluatedValue) : null;
                }
 
                public static string GetMetadataValueEscaped (ProjectItemDefinition item, string name)
                {
-                       var md = item.Metadata.FirstOrDefault (m => m.Name == name);
+                       var md = item.Metadata.FirstOrDefault (m => m.Name.Equals (name, StringComparison.OrdinalIgnoreCase));
                        return md != null ? ProjectCollection.Escape (md.EvaluatedValue) : null;
                }
 
@@ -522,6 +488,7 @@ namespace Microsoft.Build.Evaluation
                public static string GetPropertyValueEscaped (ProjectProperty property)
                {
                        // WTF happens here.
+                       //return ProjectCollection.Escape (property.EvaluatedValue);
                        return property.EvaluatedValue;
                }