Skip to content

Commit 2c77a8d

Browse files
authored
[param-name-importer] Integrate xamarin-android-docimporter-ng (#560)
Commit e0a0daf added `build-tools/xamarin-android-docimporter-ng`, which is a utility to assist extracting Java method parameter names from Android DroidDoc documentation and from the `android-stubs-src.jar` files included in the Android SDK, by using a minimal Irony-based parser for a subset of the Java language grammar. `build-tools/xamarin-android-docimporter-ng` was a "clone" of https://github.com/atsushieno/xamarin-android-docimporter-ng. As a "clone", it was not "integrated" with the rest of the repo. Integrate `xamarin-android-docimporter-ng` into the repo: 1. Add a new `src/Java.Interop.Tools.JavaSource` assembly which contains the Java language grammer code. This will be useful "elsewhere", in particular for extracting JavaDoc documentation. 2. Add a new `tests/Java.Interop.Tools.JavaSource-Tests` assembly which contains unit tests for `Java.Interop.Tools.JavaSource.dll`. 3. Add a new `tools/param-name-importer` utility. `param-name-importer.exe` is the `.exe` formerly known as `xamarin-android-docimporter-ng.exe`. With the integration complete, remove `build-tools/xamarin-android-docimporter-ng`.
1 parent 621e297 commit 2c77a8d

31 files changed

+254
-635
lines changed

Java.Interop.sln

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Dynamic", "src
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Export", "src\Java.Interop.Export\Java.Interop.Export.csproj", "{B501D075-6183-4E1D-92C9-F7B5002475B1}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaSource", "src\Java.Interop.Tools.JavaSource\Java.Interop.Tools.JavaSource.csproj", "{5C0B3562-8DA0-4726-9762-75B9709ED6B7}"
27+
EndProject
2628
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Desktop", "Desktop", "{0998E45F-8BCE-4791-A944-962CD54E2D80}"
2729
EndProject
2830
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Runtime.Environment", "src\Java.Runtime.Environment\Java.Runtime.Environment.csproj", "{5887B410-D448-4257-A46B-EAC03C80BE93}"
@@ -85,6 +87,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.BootstrapTasks
8587
EndProject
8688
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xamarin.Android.Tools.AndroidSdk", "external\xamarin-android-tools\src\Xamarin.Android.Tools.AndroidSdk\Xamarin.Android.Tools.AndroidSdk.csproj", "{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}"
8789
EndProject
90+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Java.Interop.Tools.JavaSource-Tests", "tests\Java.Interop.Tools.JavaSource-Tests\Java.Interop.Tools.JavaSource-Tests.csproj", "{093B5E94-7FB7-499F-9C11-30944BAFEE25}"
91+
EndProject
92+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "param-name-importer", "tools\param-name-importer\param-name-importer.csproj", "{0E3AF6C1-7638-464D-9174-485D494499DC}"
93+
EndProject
8894
Global
8995
GlobalSection(SharedMSBuildProjectFiles) = preSolution
9096
src\Java.Interop.NamingCustomAttributes\Java.Interop.NamingCustomAttributes.projitems*{58b564a1-570d-4da2-b02d-25bddb1a9f4f}*SharedItemsImports = 4
@@ -232,6 +238,14 @@ Global
232238
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Debug|Any CPU.Build.0 = Debug|Any CPU
233239
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.ActiveCfg = Release|Any CPU
234240
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157}.Release|Any CPU.Build.0 = Release|Any CPU
241+
{093B5E94-7FB7-499F-9C11-30944BAFEE25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
242+
{093B5E94-7FB7-499F-9C11-30944BAFEE25}.Debug|Any CPU.Build.0 = Debug|Any CPU
243+
{093B5E94-7FB7-499F-9C11-30944BAFEE25}.Release|Any CPU.ActiveCfg = Release|Any CPU
244+
{093B5E94-7FB7-499F-9C11-30944BAFEE25}.Release|Any CPU.Build.0 = Release|Any CPU
245+
{0E3AF6C1-7638-464D-9174-485D494499DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
246+
{0E3AF6C1-7638-464D-9174-485D494499DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
247+
{0E3AF6C1-7638-464D-9174-485D494499DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
248+
{0E3AF6C1-7638-464D-9174-485D494499DC}.Release|Any CPU.Build.0 = Release|Any CPU
235249
EndGlobalSection
236250
GlobalSection(SolutionProperties) = preSolution
237251
HideSolutionNode = FALSE
@@ -245,6 +259,7 @@ Global
245259
{BB0AB9F7-0979-41A7-B7A9-877260655F94} = {4C173212-371D-45D8-BA83-9226194F48DC}
246260
{AD4468F8-8883-434B-9D4C-E1801BB3B52A} = {4C173212-371D-45D8-BA83-9226194F48DC}
247261
{B501D075-6183-4E1D-92C9-F7B5002475B1} = {4C173212-371D-45D8-BA83-9226194F48DC}
262+
{5C0B3562-8DA0-4726-9762-75B9709ED6B7} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
248263
{5887B410-D448-4257-A46B-EAC03C80BE93} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
249264
{B17475BC-45A2-47A3-B8FC-62F3A0959EE0} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
250265
{07BC4495-1267-4B78-9EA6-B76FEEA2A64A} = {0998E45F-8BCE-4791-A944-962CD54E2D80}
@@ -272,6 +287,8 @@ Global
272287
{D1243BAB-23CA-4566-A2A3-3ADA2C2DC3AF} = {4C173212-371D-45D8-BA83-9226194F48DC}
273288
{3E8E5C8C-59A6-4A9A-B55D-46AB14431B2A} = {172B608B-E6F3-41CC-9949-203A76BA247C}
274289
{E34BCFA0-CAA4-412C-AA1C-75DB8D67D157} = {172B608B-E6F3-41CC-9949-203A76BA247C}
290+
{093B5E94-7FB7-499F-9C11-30944BAFEE25} = {271C9F30-F679-4793-942B-0D9527CB3E2F}
291+
{0E3AF6C1-7638-464D-9174-485D494499DC} = {C8F58966-94BF-407F-914A-8654F8B8AE3B}
275292
EndGlobalSection
276293
GlobalSection(ExtensibilityGlobals) = postSolution
277294
SolutionGuid = {29204E0C-382A-49A0-A814-AD7FBF9774A5}

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ TESTS = \
2727
bin/Test$(CONFIGURATION)/Java.Interop.Dynamic-Tests.dll \
2828
bin/Test$(CONFIGURATION)/Java.Interop.Export-Tests.dll \
2929
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaCallableWrappers-Tests.dll \
30+
bin/Test$(CONFIGURATION)/Java.Interop.Tools.JavaSource-Tests.dll \
3031
bin/Test$(CONFIGURATION)/logcat-parse-Tests.dll \
3132
bin/Test$(CONFIGURATION)/generator-Tests.dll \
3233
bin/Test$(CONFIGURATION)/Xamarin.Android.Tools.ApiXmlAdjuster-Tests.dll \

build-tools/xamarin-android-docimporter-ng/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)