diff options
| author | Lluis Sanchez <slluis.devel@gmail.com> | 2015-12-16 12:26:11 +0300 |
|---|---|---|
| committer | Lluis Sanchez <slluis.devel@gmail.com> | 2015-12-16 12:26:11 +0300 |
| commit | db5f99bad79b1626a465cb685698e32781fd0ac8 (patch) | |
| tree | b574fbc06c190678301c3c8e00c181cfc1cb75e8 /main | |
| parent | 84a49acaaf4336c452bccf1bf91682aade7dfcb7 (diff) | |
| parent | 8e39890eec07d9902079d22a326cdf2301ca9795 (diff) | |
Merge pull request #1186 from mhutch/fix-gettext-update
[mdtool] Fix tools that depend on PlatformService
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/AssemblyInfo.cs | 1 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs | 9 | ||||
| -rw-r--r-- | main/src/tools/mdtool/mdtool.csproj | 4 | ||||
| -rw-r--r-- | main/src/tools/mdtool/src/mdtool.cs | 3 |
4 files changed, 17 insertions, 0 deletions
diff --git a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs index f5110291c3..30c20c8dbd 100644 --- a/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs +++ b/main/src/core/MonoDevelop.Ide/AssemblyInfo.cs @@ -32,3 +32,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("MonoDevelop.CSharpBinding.AspNet")] [assembly: InternalsVisibleTo("MonoDevelop.GtkCore")] [assembly: InternalsVisibleTo("MonoDevelop.PackageManagement")] +[assembly: InternalsVisibleTo("mdtool")] diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs index 8455c21735..22406f91de 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/DesktopService.cs @@ -52,6 +52,11 @@ namespace MonoDevelop.Ide public static void Initialize () { + Initialize (false); + } + + internal static void Initialize (bool noGui) + { if (platformService != null) return; object[] platforms = AddinManager.GetExtensionObjects ("/MonoDevelop/Core/PlatformService"); @@ -62,6 +67,10 @@ namespace MonoDevelop.Ide LoggingService.LogFatalError ("A platform service implementation has not been found."); } PlatformService.Initialize (); + + if (noGui) + return; + if (PlatformService.CanOpenTerminal) Runtime.ProcessService.SetExternalConsoleHandler (PlatformService.StartConsoleProcess); diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj index 7d0cbfbf99..227e5b96d6 100644 --- a/main/src/tools/mdtool/mdtool.csproj +++ b/main/src/tools/mdtool/mdtool.csproj @@ -51,6 +51,10 @@ <Name>Mono.Addins.Setup</Name> <Private>False</Private> </ProjectReference> + <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> + <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> + <Name>MonoDevelop.Ide</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Compile Include="src\AssemblyInfo.cs" /> diff --git a/main/src/tools/mdtool/src/mdtool.cs b/main/src/tools/mdtool/src/mdtool.cs index e3f82aad9a..903e9ff3fd 100644 --- a/main/src/tools/mdtool/src/mdtool.cs +++ b/main/src/tools/mdtool/src/mdtool.cs @@ -135,6 +135,9 @@ class MonoDevelopProcessHost return badInput? 1 : 0; } + //needed for mimetype service etc + MonoDevelop.Ide.DesktopService.Initialize (true); + var task = tool.Run (toolArgs); task.ContinueWith ((t) => sc.ExitLoop ()); sc.RunMainLoop (); |