From 1f8adda2ad44834db723479937c42290566ca254 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Sat, 11 Feb 2017 02:51:16 +0900 Subject: [PATCH] [msbuild] JavaDocJar items should also be passed to ClassParse task. ClassParse implementation actually ignores the doclet types so this change itself actually doesn't do anything (changes to Java.Interop is being published too). So far it passes new jar-originated docs just like other JavaDoc/DroidDoc properties. --- src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs | 5 ++++- .../Xamarin.Android.Bindings.targets | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs index e1761f5ae0b..678c9c73380 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs @@ -31,10 +31,12 @@ public class ClassParse : Task public ITaskItem [] DroidDoc2Paths { get; set; } + public ITaskItem [] JavaDocs { get; set; } + public IEnumerable DocsPaths { get { Func> f = l => l ?? Enumerable.Empty (); - return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)); + return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)).Concat (f (JavaDocs)); } } @@ -48,6 +50,7 @@ public override bool Execute () Log.LogTaskItems (" Java8DocPaths: ", Java8DocPaths); Log.LogTaskItems (" DroidDocPaths: ", DroidDocPaths); Log.LogTaskItems (" DroidDoc2Paths: ", DroidDoc2Paths); + Log.LogTaskItems (" JavaDocs: ", JavaDocs); using (var output = new StreamWriter (OutputFile, append: false, encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false))) { diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets index 2c5963c6511..a284c4bf2cb 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets @@ -387,6 +387,7 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved. Java7DocPaths="$(Java7DocPaths)" Java8DocPaths="$(Java8DocPaths)" DroidDocPaths="$(DroidDocPaths)" + JavaDocs="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')" />