X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build%2FMicrosoft.Build.Evaluation%2FProject.cs;h=4f7fbd168ce50eaec7965274a649ac78f697af20;hb=96edd46e16619fe64e26ea017330c22bf893f0dd;hp=9c26df0e332bc28c816032b7241baf1cb492e2ef;hpb=1c8ee6ae17969a82520235ba6690ef8dc5cdfa00;p=mono.git diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs index 9c26df0e332..4f7fbd168ce 100644 --- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs +++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs @@ -41,9 +41,36 @@ 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; +// Basically there are two semantic Project object models and their relationship is not obvious +// (apart from Microsoft.Build.Construction.ProjectRootElement which is a "construction rule"). +// +// Microsoft.Build.Evaluation.Project holds some "editable" project model, and it supports +// detailed loader API (such as Items and AllEvaluatedItems). +// ProjectPoperty holds UnevaluatedValue and gives EvaluatedValue too. +// +// Microsoft.Build.Execution.ProjectInstance holds "snapshot" of a project, and it lacks +// detailed loader API. It does not give us Unevaluated property value. +// On the other hand, it supports Targets object model. What Microsoft.Build.Evaluation.Project +// offers there is actually a list of Microsoft.Build.Execution.ProjectInstance objects. +// It should be also noted that only ProjectInstance has Evaluate() method (Project doesn't). +// +// And both API holds different set of descendant types for each and cannot really share the +// loader code. That is lame. +// +// So, can either of them be used to construct the other model? Both API models share the same +// "governor", which is Microsoft.Build.Evaluation.ProjectCollection/ Project is added to +// its LoadedProjects list, while ProjectInstance isn't. Project cannot be loaded to load +// a ProjectInstance, at least within the same ProjectCollection. +// +// On the other hand, can ProjectInstance be used to load a Project? Maybe. Since Project and +// its descendants need Microsoft.Build.Construction.ProjectElement family as its API model +// is part of the public API. Then I still have to understand how those AllEvaluatedItems/ +// AllEvaluatedProperties members make sense. EvaluationCounter is another propery in question. + namespace Microsoft.Build.Evaluation { [DebuggerDisplay ("{FullPath} EffectiveToolsVersion={ToolsVersion} #GlobalProperties=" @@ -104,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) @@ -160,7 +176,7 @@ namespace Microsoft.Build.Evaluation List properties; Dictionary targets; - void Initialize (Project parent) + void Initialize () { dir_path = Directory.GetCurrentDirectory (); raw_imports = new List (); @@ -168,31 +184,27 @@ namespace Microsoft.Build.Evaluation targets = new Dictionary (); raw_items = new List (); - // FIXME: this is likely hack. Test ImportedProject.Properties to see what exactly should happen. - if (parent != null) { - properties = parent.properties; - } else { - properties = new List (); - - foreach (DictionaryEntry p in Environment.GetEnvironmentVariables ()) + properties = new List (); + + 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 ReservedProjectProperty.GetReservedProperties (tools, this)) - this.properties.Add (p); - foreach (var p in EnvironmentProjectProperty.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. @@ -206,6 +218,9 @@ namespace Microsoft.Build.Evaluation // next, evaluate items EvaluateItems (elements); + + // finally, evaluate targets and tasks + EvaluateTargets (elements); } IEnumerable EvaluatePropertiesAndImports (IEnumerable elements) @@ -214,26 +229,33 @@ namespace Microsoft.Build.Evaluation foreach (var child in elements) { yield return child; var pge = child as ProjectPropertyGroupElement; - if (pge != null && ShouldInclude (pge.Condition)) + if (pge != null && Evaluate (pge.Condition)) foreach (var p in pge.Properties) // do not allow overwriting reserved or well-known properties by user if (!this.properties.Any (_ => (_.IsReservedProperty || _.IsWellKnownProperty) && _.Name.Equals (p.Name, StringComparison.InvariantCultureIgnoreCase))) - if (ShouldInclude (p.Condition)) + if (Evaluate (p.Condition)) this.properties.Add (new XmlProjectProperty (this, p, PropertyType.Normal, ProjectCollection.OngoingImports.Any ())); var ige = child as ProjectImportGroupElement; - if (ige != null && ShouldInclude (ige.Condition)) { + 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; - if (inc != null && ShouldInclude (inc.Condition)) + if (inc != null && Evaluate (inc.Condition)) foreach (var e in Import (inc)) yield return e; } } + + internal IEnumerable GetAllItems (string include, string exclude, Func creator, Func taskItemCreator, Func itemTypeCheck, Action assignRecurse) + { + return ProjectCollection.GetAllItems (ExpandString, include, exclude, creator, taskItemCreator, DirectoryPath, assignRecurse, + t => all_evaluated_items.Any (i => i.EvaluatedInclude == t.ItemSpec && itemTypeCheck (i.ItemType))); + } void EvaluateItems (IEnumerable elements) { @@ -241,42 +263,19 @@ namespace Microsoft.Build.Evaluation var ige = child as ProjectItemGroupElement; if (ige != null) { foreach (var p in ige.Items) { - if (!ShouldInclude (ige.Condition) || !ShouldInclude (p.Condition)) + 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 creator = s => new ProjectItem (this, p, s); + foreach (var item in GetAllItems (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); - } } } } var def = child as ProjectItemDefinitionGroupElement; if (def != null) { foreach (var p in def.ItemDefinitions) { - if (ShouldInclude (p.Condition)) { + if (Evaluate (p.Condition)) { ProjectItemDefinition existing; if (!item_definitions.TryGetValue (p.ItemType, out existing)) item_definitions.Add (p.ItemType, (existing = new ProjectItemDefinition (this, p.ItemType))); @@ -288,14 +287,25 @@ namespace Microsoft.Build.Evaluation all_evaluated_items.Sort ((p1, p2) => string.Compare (p1.ItemType, p2.ItemType, StringComparison.OrdinalIgnoreCase)); } + void EvaluateTargets (IEnumerable elements) + { + foreach (var child in elements) { + var te = child as ProjectTargetElement; + if (te != null) + // It overwrites same name target. + this.targets [te.Name] = new ProjectTargetInstance (te); + } + } + IEnumerable Import (ProjectImportElement import) { - string dir = GetEvaluationTimeThisFileDirectory (); - string path = Path.IsPathRooted (import.Project) ? import.Project : dir != null ? Path.Combine (dir, import.Project) : Path.GetFullPath (import.Project); + string dir = ProjectCollection.GetEvaluationTimeThisFileDirectory (() => FullPath); + 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) { case ProjectLoadSettings.RejectCircularImports: - throw new InvalidProjectFileException (import.Location, null, string.Format ("Circular imports was detected: {0} is already on \"importing\" stack", path)); + throw new InvalidProjectFileException (import.Location, null, string.Format ("Circular imports was detected: {0} (resolved as \"{1}\") is already on \"importing\" stack", import.Project, path)); } return new ProjectElement [0]; // do not import circular references } @@ -352,15 +362,17 @@ namespace Microsoft.Build.Evaluation { throw new NotImplementedException (); } + + static readonly char [] target_sep = new char[] {';'}; public bool Build () { - return Build (Xml.DefaultTargets.Split (';')); + return Build (Xml.DefaultTargets.Split (target_sep, StringSplitOptions.RemoveEmptyEntries)); } public bool Build (IEnumerable loggers) { - return Build (Xml.DefaultTargets.Split (';'), loggers); + return Build (Xml.DefaultTargets.Split (target_sep, StringSplitOptions.RemoveEmptyEntries), loggers); } public bool Build (string target) @@ -375,7 +387,7 @@ namespace Microsoft.Build.Evaluation public bool Build (ILogger logger) { - return Build (Xml.DefaultTargets.Split (';'), new ILogger [] {logger}); + return Build (Xml.DefaultTargets.Split (target_sep, StringSplitOptions.RemoveEmptyEntries), new ILogger [] {logger}); } public bool Build (string[] targets, IEnumerable loggers) @@ -385,7 +397,7 @@ namespace Microsoft.Build.Evaluation public bool Build (IEnumerable loggers, IEnumerable remoteLoggers) { - return Build (Xml.DefaultTargets.Split (';'), loggers, remoteLoggers); + return Build (Xml.DefaultTargets.Split (target_sep, StringSplitOptions.RemoveEmptyEntries), loggers, remoteLoggers); } public bool Build (string target, IEnumerable loggers) @@ -414,19 +426,14 @@ namespace Microsoft.Build.Evaluation return ret; } - bool ShouldInclude (string unexpandedValue) + 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) @@ -462,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; } @@ -481,6 +488,7 @@ namespace Microsoft.Build.Evaluation public static string GetPropertyValueEscaped (ProjectProperty property) { // WTF happens here. + //return ProjectCollection.Escape (property.EvaluatedValue); return property.EvaluatedValue; } @@ -512,7 +520,7 @@ namespace Microsoft.Build.Evaluation public bool RemoveProperty (ProjectProperty property) { - var removed = properties.FirstOrDefault (p => p.Name == property.Name); + var removed = properties.FirstOrDefault (p => p.Name.Equals (property.Name, StringComparison.OrdinalIgnoreCase)); if (removed == null) return false; properties.Remove (removed);