diff options
| author | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
|---|---|---|
| committer | Michael Hutchinson <m.j.hutchinson@gmail.com> | 2011-11-08 21:57:22 +0400 |
| commit | 3d7a7f93a50819a5089e21bfedd332dc08d4f0ce (patch) | |
| tree | 0956c7d9cd3c6d2cc7344398ea6fb182952a55be /main/src/addins/MonoDevelop.MacDev | |
| parent | e51679b1a150ba564ade1510f94e9c05c4e6fa65 (diff) | |
| parent | ec035e02db5d9b6e9a2c2275d3145b44264dc546 (diff) | |
Merge remote-tracking branch 'origin/master' into macgtk
Conflicts:
extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
main/src/core/Mono.Texteditor/Mono.TextEditor/GtkWorkarounds.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.MacDev')
3 files changed, 10 insertions, 9 deletions
diff --git a/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs b/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs index 233f02effb..6a116f403a 100644 --- a/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs +++ b/main/src/addins/MonoDevelop.MacDev/AppleSdkSettings.cs @@ -141,7 +141,7 @@ namespace MonoDevelop.MacDev public static event Action Changed; } - class AppleSdkAboutInformation : MonoDevelop.Ide.Gui.Dialogs.IAboutInformation + class AppleSdkAboutInformation : ISystemInformationProvider { public string Description { get { diff --git a/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs b/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs index 29e87287e0..afcc436c37 100644 --- a/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs +++ b/main/src/addins/MonoDevelop.MacDev/MacBuildUtilities.cs @@ -192,8 +192,9 @@ namespace MonoDevelop.MacDev var output = new FileInfo (Output); if (!output.Exists) return true; + var input = new FileInfo (Input); - return input.Length != output.Length || input.LastWriteTimeUtc > output.LastWriteTimeUtc; + return input.LastWriteTimeUtc > output.LastWriteTimeUtc; } public void EnsureOutputDirectory () diff --git a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml index 1dcce3b03d..19556da65f 100644 --- a/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml +++ b/main/src/addins/MonoDevelop.MacDev/MonoDevelop.MacDev.addin.xml @@ -7,7 +7,7 @@ description = "Mac Development Support for MonoDevelop" category = "Mac Development" flags = "Hidden" - version = "2.8.1"> + version = "2.8.2"> <Runtime> <Import file = "icons/application-x-mono-develop-xib-16.png"/> @@ -22,11 +22,11 @@ </Runtime> <Dependencies> - <Addin id="Ide" version="2.8.1"/> - <Addin id="Core" version="2.8.1"/> - <Addin id="MacPlatform" version="2.8.1"/> - <Addin id="DesignerSupport" version="2.8.1"/> - <Addin id="VersionControl" version="2.8.1" /> + <Addin id="Ide" version="2.8.2"/> + <Addin id="Core" version="2.8.2"/> + <Addin id="MacPlatform" version="2.8.2"/> + <Addin id="DesignerSupport" version="2.8.2"/> + <Addin id="VersionControl" version="2.8.2" /> </Dependencies> <ExtensionPoint path = "/MonoDevelop/MacDev/ContextMenu/ProjectPad/NativeReferenceFolder"> @@ -125,7 +125,7 @@ <DisplayBinding class = "MonoDevelop.MacDev.PlistEditor.PListEditorDisplayBinding" /> </Extension> - <Extension path = "/MonoDevelop/Ide/AboutInformation"> + <Extension path = "/MonoDevelop/Core/SystemInformation"> <Class class = "MonoDevelop.MacDev.AppleSdkAboutInformation" /> </Extension> </Addin> |