Skip to content

Commit 8dceaee

Browse files
atsushienojonpryor
authored andcommitted
[Xamarin.Android.Build.Tasks] Pass @(JavaDocJar) items to ClassParse task (#437)
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.
1 parent 03e3ebc commit 8dceaee

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/ClassParse.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ public class ClassParse : Task
3131

3232
public ITaskItem [] DroidDoc2Paths { get; set; }
3333

34+
public ITaskItem [] JavaDocs { get; set; }
35+
3436
public IEnumerable<ITaskItem> DocsPaths {
3537
get {
3638
Func<ITaskItem[],IEnumerable<ITaskItem>> f = l => l ?? Enumerable.Empty<ITaskItem> ();
37-
return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths));
39+
return f (JavaDocPaths).Concat (f (Java7DocPaths)).Concat (f (Java8DocPaths)).Concat (f (DroidDocPaths)).Concat (f (DroidDoc2Paths)).Concat (f (JavaDocs));
3840
}
3941
}
4042

@@ -48,6 +50,7 @@ public override bool Execute ()
4850
Log.LogTaskItems (" Java8DocPaths: ", Java8DocPaths);
4951
Log.LogTaskItems (" DroidDocPaths: ", DroidDocPaths);
5052
Log.LogTaskItems (" DroidDoc2Paths: ", DroidDoc2Paths);
53+
Log.LogTaskItems (" JavaDocs: ", JavaDocs);
5154

5255
using (var output = new StreamWriter (OutputFile, append: false,
5356
encoding: new UTF8Encoding (encoderShouldEmitUTF8Identifier: false))) {

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Bindings.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ Copyright (C) 2012 Xamarin Inc. All rights reserved.
387387
Java7DocPaths="$(Java7DocPaths)"
388388
Java8DocPaths="$(Java8DocPaths)"
389389
DroidDocPaths="$(DroidDocPaths)"
390+
JavaDocs="@(JavaDocJar->'$(IntermediateOutputPath)javadocs\%(FileName)')"
390391
/>
391392

392393
<BindingsGenerator Condition="'$(AndroidClassParser)' == 'class-parse'"

0 commit comments

Comments
 (0)