diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-07-22 14:11:28 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-07-22 14:11:28 +0400 |
| commit | 802729acccb611c280e6dd24c7e003f1e68f0cfe (patch) | |
| tree | 27d8d9ad977f8023eab095f51b29a6d0fed4f11a /main/src/addins/CBinding | |
| parent | dbd6e685ef6f8ff1e8acf54a173cff6fdae67c59 (diff) | |
| parent | 5bcd595f360d52d2d2d93782e913f4957b2e91df (diff) | |
Merge branch 'master' into newresolver
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineNodeComparer.cs
main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs
main/src/addins/MonoDevelop.MacDev/Makefile.am
main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.csproj
main/src/addins/MonoDevelop.MacDev/ObjCIntegration/CSharpCodeCodebehind.cs
main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor/XmlDocumentParser.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDomService.cs
main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilCompilationUnit.cs
Diffstat (limited to 'main/src/addins/CBinding')
| -rw-r--r-- | main/src/addins/CBinding/Parser/CTagsManager.cs | 2 | ||||
| -rw-r--r-- | main/src/addins/CBinding/Parser/TagDatabaseManager.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/addins/CBinding/Parser/CTagsManager.cs b/main/src/addins/CBinding/Parser/CTagsManager.cs index 6449440e3c..5f4aa0b60f 100644 --- a/main/src/addins/CBinding/Parser/CTagsManager.cs +++ b/main/src/addins/CBinding/Parser/CTagsManager.cs @@ -42,7 +42,7 @@ namespace CBinding.Parser protected abstract IEnumerable<string> GetTags (FileInformation fileInfo); protected abstract IEnumerable<string> GetTags (Project project, string filename, IEnumerable<string> headers); - public static readonly string SystemTagsDirectory = PropertyService.Locations.Cache.Combine ("CTagsData"); + public static readonly string SystemTagsDirectory = UserProfile.Current.CacheDir.Combine ("CTagsData"); public static string CTagsExecutable { get { return PropertyService.Get<string> ("CBinding.CTagsExecutable", "ctags"); } diff --git a/main/src/addins/CBinding/Parser/TagDatabaseManager.cs b/main/src/addins/CBinding/Parser/TagDatabaseManager.cs index e2658afa74..c88d2c4db0 100644 --- a/main/src/addins/CBinding/Parser/TagDatabaseManager.cs +++ b/main/src/addins/CBinding/Parser/TagDatabaseManager.cs @@ -88,7 +88,7 @@ namespace CBinding.Parser try { var output = new StringWriter (); Runtime.ProcessService.StartProcess (CTagsManager.CTagsExecutable, "--version", null, output, null, null).WaitForExit (); - if (PropertyService.IsMac && !output.ToString ().StartsWith ("Exuberant", StringComparison.Ordinal)) { + if (Platform.IsMac && !output.ToString ().StartsWith ("Exuberant", StringComparison.Ordinal)) { System.Console.WriteLine ("Fallback to OSX ctags"); ctags = new BsdCTagsManager (); } else { |