diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-22 22:02:12 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2015-04-22 22:02:12 +0300 |
| commit | 8ef38be5e9d8cd744df0af5ae955a5b2a892e229 (patch) | |
| tree | b97fb0dcda5310aa97fc78169078c6be7c69ade5 /main/src/addins/MonoDevelop.Autotools | |
| parent | b91054f1b963a893b70c2a8467f932a644a60d68 (diff) | |
Track api changes
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs | 31 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml | 9 |
2 files changed, 16 insertions, 24 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs index 560bd8a429..9c990213a6 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs @@ -43,30 +43,27 @@ using System.Threading.Tasks; namespace MonoDevelop.Autotools { - public class MakefileProjectServiceExtension : ProjectServiceExtension + public class MakefileProjectServiceExtension : SolutionExtension { - public async override Task<WorkspaceItem> LoadWorkspaceItem (ProgressMonitor monitor, string fileName) + protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.SlnFile file) { - WorkspaceItem item = await base.LoadWorkspaceItem (monitor, fileName); - - Solution sol = item as Solution; - if (sol != null) { - //Resolve project references - try { - MakefileData.ResolveProjectReferences (sol.RootFolder, monitor); - } catch (Exception e) { - LoggingService.LogError (GettextCatalog.GetString ( - "Error resolving Makefile based project references for solution {0}", sol.Name), e); - monitor.ReportError (GettextCatalog.GetString ( - "Error resolving Makefile based project references for solution {0}", sol.Name), e); - } + base.OnReadSolution (monitor, file); + + //Resolve project references + try { + MakefileData.ResolveProjectReferences (Solution.RootFolder, monitor); + } catch (Exception e) { + LoggingService.LogError (GettextCatalog.GetString ( + "Error resolving Makefile based project references for solution {0}", Solution.Name), e); + monitor.ReportError (GettextCatalog.GetString ( + "Error resolving Makefile based project references for solution {0}", Solution.Name), e); } - return item; + // All done, dispose myself + Dispose (); } } - [ExportProjectModelExtension] public class MakefileProjectExtension: ProjectExtension { MakefileData data; diff --git a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml index aa3a14dbaa..dbad71a433 100644 --- a/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml +++ b/main/src/addins/MonoDevelop.Autotools/MonoDevelop.Autotools.addin.xml @@ -23,15 +23,10 @@ <NodeBuilder id = "AutotoolNodeExtension" class = "MonoDevelop.Autotools.NodeExtension"/> </Extension> - <Extension path = "/MonoDevelop/ProjectModel/ProjectServiceExtensions"> - <Condition id="Platform" value="!windows"> - <Class class = "MonoDevelop.Autotools.MakefileProjectServiceExtension" id="MakefileProjectServiceExtension" insertafter="FinalStep"/> - </Condition> - </Extension> - <Extension path = "/MonoDevelop/ProjectModel/ProjectModelExtensions"> <Condition id="Platform" value="!windows"> - <Class class = "MonoDevelop.Autotools.MakefileProjectExtension" id="MakefileProjectServiceExtension" insertafter="FinalStep"/> + <Class class = "MonoDevelop.Autotools.MakefileProjectServiceExtension" insertafter="FinalStep"/> + <Class class = "MonoDevelop.Autotools.MakefileProjectExtension" insertafter="FinalStep"/> </Condition> </Extension> |