[api-xml-adjuster] give chance to set logging verbosity in ApiXmlAdjuster.

ApiXmlAdjuster had been ignoring logging verbosity, but now it is time
to respect that at least from generator.

(mono xbuild does not appropriately implement some MSBuild logging API so
it will not be usable very soon until we switch to Microsoft/msbuild...)

Author: atsushieno

src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiDefectFinderExtensions.cs

@@ -22,7 +22,7 @@ static void FindParametersDefects (this JavaMethodBase methodBase)
 			int dummy;
 			foreach (var p in methodBase.Parameters) {
 				if (p.Name.StartsWith ("p", StringComparison.Ordinal) && int.TryParse (p.Name.Substring (1), out dummy)) {
-					Console.Error.WriteLine ("Warning: {0} in {1} has 'unnamed' parameters", methodBase.Parent, methodBase);
+					Log.LogWarning ("Warning: {0} in {1} has 'unnamed' parameters", methodBase.Parent, methodBase);
 					break; // reporting once is enough.
 				}
 			}

src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiGenericInheritanceMapperExtensions.cs

@@ -30,7 +30,7 @@ static void PrepareGenericInheritanceMapping (this JavaClass cls)
 					cls.GenericInheritanceMapping = empty;
 				else if (cls.ResolvedExtends.ReferencedType.TypeParameters == null) {
 					// FIXME: I guess this should not happen. But this still happens.
-					Console.WriteLine ("Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not.", cls.ExtendsGeneric, cls.FullName);
+					Log.LogWarning ("Warning: '{0}' is referenced as base type of '{1}' and expected to have generic type parameters, but it does not.", cls.ExtendsGeneric, cls.FullName);
 					cls.GenericInheritanceMapping = empty;
 				} else {
 					if (cls.ResolvedExtends.ReferencedType.TypeParameters.TypeParameters.Count != cls.ResolvedExtends.TypeParameters.Count)
@@ -44,8 +44,6 @@ static void PrepareGenericInheritanceMapping (this JavaClass cls)
 						dic.Add (new JavaTypeReference (kvp.Key, null), kvp.Value);
 					if (dic.Any ()) {
 						cls.GenericInheritanceMapping = dic;
-//Console.WriteLine ("in {0}.{1}: {2}", cls.Parent.Name, cls.Name,
-//	string.Join (", ", dic.Select (p => string.Format ("base {0} becomes {1}", p.Key.ReferencedTypeParameter.Name, p.Value.ToString ()))));
 					}
 					else
 						cls.GenericInheritanceMapping = empty;

src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiTypeResolverExtensions.cs

@@ -54,9 +54,9 @@ public static void Resolve (this JavaApi api)
 			while (true) {
 				bool errors = false;
 				foreach (var t in api.Packages.SelectMany (p => p.Types).OfType<JavaClass> ().ToArray ())
-					try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Console.Error.WriteLine (string.Format ("Error while processing type '{0}': {1}", t, ex.Message)); errors = true; t.Parent.Types.Remove (t); }
+					try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError ("Error while processing type '{0}': {1}", t, ex.Message); errors = true; t.Parent.Types.Remove (t); }
 				foreach (var t in api.Packages.SelectMany (p => p.Types).OfType<JavaInterface> ().ToArray ())
-					try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Console.Error.WriteLine (string.Format ("Error while processing type '{0}': {1}", t, ex.Message)); errors = true; t.Parent.Types.Remove (t); }
+					try { t.Resolve (); } catch (JavaTypeResolutionException ex) { Log.LogError ("Error while processing type '{0}': {1}", t, ex.Message); errors = true; t.Parent.Types.Remove (t); }
 				if (!errors)
 					break;
 			}
@@ -89,7 +89,7 @@ static void ResolveWithTryCatch (Action resolve, JavaMember m)
 			try {
 				resolve ();
 			} catch (JavaTypeResolutionException ex) {
-				Console.Error.WriteLine (string.Format ("Error while processing '{0}' in '{1}': {2}", m, m.Parent, ex.Message));
+				Log.LogError ("Error while processing '{0}' in '{1}': {2}", m, m.Parent, ex.Message);
 				m.Parent.Members.Remove (m);
 			}
 		}
@@ -128,7 +128,7 @@ static void Resolve (this JavaTypeParameters tp, JavaApi api, params JavaTypePar
 			foreach (var t in tp.TypeParameters)
 				if (t.GenericConstraints != null)
 					foreach (var g in t.GenericConstraints.GenericConstraints)
-						try { g.ResolvedType = api.Parse (g.Type, additionalTypeParameters); } catch (JavaTypeResolutionException ex) { Console.Error.WriteLine (string.Format ("Warning: failed to resolve generic constraint: '{0}': {1}", g.Type, ex.Message)); }
+						try { g.ResolvedType = api.Parse (g.Type, additionalTypeParameters); } catch (JavaTypeResolutionException ex) { Log.LogWarning ("Warning: failed to resolve generic constraint: '{0}': {1}", g.Type, ex.Message); }
 		}
 	}
 }

src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaTypeResolutionUtil.cs

@@ -85,8 +85,8 @@ static bool IsConformantType (this JavaTypeParameter typeParameter, JavaTypeRefe
 			if (typeParameter.GenericConstraints == null)
 				return true;
 			// FIXME: implement correct generic constraint conformance check.
-			Console.Error.WriteLine ("WARNING: generic constraint conformance check is not implemented, so the type might be actually compatible. Type parameter: {0}{1}, examined type: {2}",
-				typeParameter.Name, typeParameter.Parent.ParentMethod?.Name ?? typeParameter.Parent.ParentType?.Name, examinedType.ToString ());
+			Log.LogDebug ("NOTICE: generic constraint conformance check is not implemented, so the type might be actually compatible. Type parameter: {0}{1}, examined type: {2}",
+			                               typeParameter.Name, typeParameter.Parent.ParentMethod?.Name ?? typeParameter.Parent.ParentType?.Name, examinedType);
 			return false;
 		}
 	}

src/Xamarin.Android.Tools.ApiXmlAdjuster/Xamarin.Android.Tools.ApiXmlAdjuster.csproj

@@ -49,6 +49,7 @@
     <Compile Include="JavaApiDefectFinderExtensions.cs" />
     <Compile Include="JavaTypeResolutionUtil.cs" />
     <Compile Include="JavaApiFixVisibilityExtensions.cs" />
+    <Compile Include="Log.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>

tools/generator/ApiXmlAdjuster.cs

@@ -5,8 +5,21 @@ namespace Xamarin.Android.Tools.ApiXmlAdjuster
 {
 	public class Adjuster
 	{
-		public void Process (string inputXmlFile, GenBase [] gens, string outputXmlFile)
+		public void Process (string inputXmlFile, GenBase [] gens, string outputXmlFile, int reportVerbosity)
 		{
+			switch (reportVerbosity) {
+			case 0:
+				break;
+			case 1:
+				Log.Verbosity = Log.LoggingLevel.Error;
+				break;
+			case 2:
+				Log.Verbosity = Log.LoggingLevel.Warning;
+				break;
+			default:
+				Log.Verbosity = Log.LoggingLevel.Debug;
+				break;
+			}
 			var api = new JavaApi ();
 			api.LoadReferences (gens);
 			api.Load (inputXmlFile);

tools/generator/CodeGenerator.cs

@@ -282,7 +282,7 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 			}
 			if (apiSourceAttr == "class-parse") {
 				apiXmlFile = api_xml_adjuster_output ?? Path.Combine (Path.GetDirectoryName (filename), Path.GetFileName (filename) + ".adjusted");
-				new Adjuster ().Process (filename, SymbolTable.AllRegisteredSymbols ().OfType<GenBase> ().ToArray (), apiXmlFile);
+				new Adjuster ().Process (filename, SymbolTable.AllRegisteredSymbols ().OfType<GenBase> ().ToArray (), apiXmlFile, Report.Verbosity ?? 0);
 			}
 			if (only_xml_adjuster)
 				return;