diff options
author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-14 19:45:01 +0300 |
---|---|---|
committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-12-14 19:45:01 +0300 |
commit | 8b3a1c9324f2f4284c6b291a65488c5230efe8b8 (patch) | |
tree | 8bcbd42dd1ad38b7fca184fdf0b005b21cffe361 /main/src/addins/MonoDevelop.Autotools | |
parent | 64d7c147d89d06d6e3d5f738166b1a1310b1a9b4 (diff) | |
parent | 7a1b3c55032dbd2fc908d9aaf1418977afe4db86 (diff) |
Merge remote-tracking branch 'origin/master' into roslyn-nogtkshell
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
3 files changed, 8 insertions, 18 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs index 452b56c66e..a11cb8d733 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs @@ -39,7 +39,7 @@ using MonoDevelop.Projects; using MonoDevelop.Core.Assemblies; using MonoDevelop.Ide; using System.Xml; -using MonoDevelop.Projects.Formats.MSBuild; +using MonoDevelop.Projects.MSBuild; namespace MonoDevelop.Autotools { diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs index d0575adc6e..7c39600a08 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs @@ -45,7 +45,7 @@ namespace MonoDevelop.Autotools { public class MakefileProjectServiceExtension : SolutionExtension { - protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.SlnFile file) + protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.SlnFile file) { base.OnReadSolution (monitor, file); @@ -77,7 +77,7 @@ namespace MonoDevelop.Autotools set { data = value; } } - protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { base.OnReadProject (monitor, msproject); var ext = msproject.GetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo"); @@ -102,7 +102,7 @@ namespace MonoDevelop.Autotools } } - protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject) + protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject) { base.OnWriteProject (monitor, msproject); diff --git a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs index 30fbb7f176..74f91b4895 100644 --- a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs +++ b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs @@ -297,8 +297,10 @@ namespace MonoDevelop.Autotools { if (reference.ReferenceType != ReferenceType.Project) continue; - Project refp = GetProjectFromName (reference.Reference, ctx.TargetSolution); - + Project refp = reference.ResolveProject (ctx.TargetSolution); + if (refp == null) { + throw new Exception (GettextCatalog.GetString ("Couldn't find referenced project '{0}'", reference.Reference)); + } if (!(refp is DotNetProject)) continue; @@ -772,18 +774,6 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define)); dict [extName] = filePath; return extName; } - - Project GetProjectFromName (string name, Solution targetSolution) - { - Project refp = null; - if (targetSolution != null) refp = targetSolution.FindProjectByName (name); - - if (refp == null) - throw new Exception ( GettextCatalog.GetString ("Couldn't find referenced project '{0}'", - name ) ); - - return refp; - } } class DeployFileData |