Skip to content

Instantly share code, notes, and snippets.

@VincentDondain
Created November 17, 2015 20:23
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save VincentDondain/51d18a51324eb30d353d to your computer and use it in GitHub Desktop.
Save VincentDondain/51d18a51324eb30d353d to your computer and use it in GitHub Desktop.
commit 6161c402867fe701cc59841ffbb561ccbe4e59e6
Author: VincentDondain <vincent.dondain@xamarin.com>
Date: Tue Nov 17 20:18:20 2015 +0000
[iOS] Added mtouch verbosity logic
diff --git a/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj b/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
index 7870959..2bf2ec6 100644
--- a/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
+++ b/MonoDevelop.IPhone/MonoDevelop.IPhone/MonoDevelop.IPhone.csproj
@@ -139,6 +139,9 @@
<HintPath>..\..\Xamarin.Ide.Insights\build\Xamarin.Ide.Insights.dll</HintPath>
<Private>False</Private>
</Reference>
+ <Reference Include="MonoDevelop.Projects.Formats.MSBuild">
+ <HintPath>..\..\..\monodevelop\main\build\bin\MonoDevelop.Projects.Formats.MSBuild.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
diff --git a/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProject.cs b/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProject.cs
index ad48661..c3da1e2 100644
--- a/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProject.cs
+++ b/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProject.cs
@@ -53,6 +53,8 @@ using MonoDevelop.Core.Assemblies;
using System.Threading.Tasks;
using MonoDevelop.Core.StringParsing;
+using MonoDevelop.Projects.Formats.MSBuild;
+
using LS = MonoDevelop.Core.LoggingService;
using Xamarin.Ide.Insights;
@@ -1352,6 +1354,11 @@ namespace MonoDevelop.IPhone
protected override BuildResult OnBuild (IProgressMonitor monitor, ConfigurationSelector configuration)
{
+ var cfg = (IPhoneProjectConfiguration) GetConfiguration (configuration);
+ cfg.MtouchVerbosity = MapVerbosity (IdeApp.Preferences.MSBuildVerbosity);
+
+ DispatchService.GuiDispatch (() => IdeApp.ProjectOperations.Save (this));
+
var appDir = GetAppBundleDirectory (monitor, configuration);
IPhoneDeployOperation.ClearUploadMarker (appDir);
@@ -1584,5 +1591,28 @@ namespace MonoDevelop.IPhone
return XamarinProduct.iOS;
}
}
+
+ static string MapVerbosity (MSBuildVerbosity v)
+ {
+ string result = null;
+ switch (v) {
+ case MSBuildVerbosity.Quiet:
+ result = "-q";
+ break;
+ case MSBuildVerbosity.Minimal:
+ result = "-v";
+ break;
+ case MSBuildVerbosity.Normal:
+ result = "-v -v";
+ break;
+ case MSBuildVerbosity.Detailed:
+ result = "-v -v -v";
+ break;
+ case MSBuildVerbosity.Diagnostic:
+ result = "-v -v -v -v";
+ break;
+ }
+ return result;
+ }
}
}
diff --git a/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProjectConfiguration.cs b/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProjectConfiguration.cs
index f7311ed..878eff7 100644
--- a/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProjectConfiguration.cs
+++ b/MonoDevelop.IPhone/MonoDevelop.IPhone/Project/IPhoneProjectConfiguration.cs
@@ -195,6 +195,9 @@ namespace MonoDevelop.IPhone
[ItemProperty ("MtouchExtraArgs", DefaultValue = null)]
public string MtouchExtraArgs { get; set; }
+
+ [ItemProperty ("MtouchVerbosity", DefaultValue = null)]
+ public string MtouchVerbosity { get; set; }
[ItemProperty ("MtouchI18n", DefaultValue = null)]
string mtouchI18n;
@@ -300,6 +303,7 @@ namespace MonoDevelop.IPhone
MtouchLink = cfg.MtouchLink;
MtouchSdkVersion = cfg.MtouchSdkVersion;
MtouchExtraArgs = cfg.MtouchExtraArgs;
+ MtouchVerbosity = cfg.MtouchVerbosity;
MtouchI18n = cfg.MtouchI18n;
MtouchFloat32 = cfg.MtouchFloat32;
MtouchUseLlvm = cfg.MtouchUseLlvm;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment