Skip to content

No need to parse JavaDoc in class-parse anymore. #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Nov 16, 2017
Merged

No need to parse JavaDoc in class-parse anymore. #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions build-tools/api-xml-adjuster/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ ANDROID_SDK_PATH=$(shell find ~/ -maxdepth 1 -name android-sdk-*)

DOCS_DIR=~/android-toolchain/docs

MANDROID = ../../bin/$(CONFIGURATION)/lib/xamarin.anroid/xbuild/Xamarin/Android
MANDROID = ../../bin/$(CONFIGURATION)/lib/xamarin.android/xbuild/Xamarin/Android
BUILDBIN = ../../bin/Build$(CONFIGURATION)

CLASS_PARSE = $(MANDROID)/class-parse.exe
API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe
RUNTIME = mono
RUNTIME = mono --debug
RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE)
RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL)
API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26
Expand Down Expand Up @@ -50,15 +50,9 @@ clean-api-xml:
rm -f $(CLASS_PARSE_XML) $(ANALYZED_XML)
$(XBUILD) /t:Clean

$(CLASS_PARSE_XML): $(CLASS_PARSE) $(ANDROID_JAR) $(DOCS_DIR_CUR_LEVEL)
$(CLASS_PARSE_XML): $(CLASS_PARSE) $(ANDROID_JAR) # $(DOCS_DIR_CUR_LEVEL)
mkdir -p $(CLASS_PARSE_XML_DIR)
if [ '$(LEVEL)' -eq 'O' ]; then \
$(RUN_CLASS_PARSE) $(ANDROID_JAR) -docspath=$(DOCS_DIR_CUR_LEVEL)/reference --docstype=droiddoc2 > $(CLASS_PARSE_XML) || rm -f $(CLASS_PARSE_XML) ;\
elif [ $(LEVEL) -le 25 ]; then \
$(RUN_CLASS_PARSE) $(ANDROID_JAR) -docspath=$(DOCS_DIR_CUR_LEVEL)/reference --docstype=droiddoc > $(CLASS_PARSE_XML) || rm -f $(CLASS_PARSE_XML) ;\
else \
$(RUN_CLASS_PARSE) $(ANDROID_JAR) -docspath=$(DOCS_DIR_CUR_LEVEL)/reference --docstype=droiddoc2 > $(CLASS_PARSE_XML) || rm -f $(CLASS_PARSE_XML) ;\
fi
$(RUN_CLASS_PARSE) $(ANDROID_JAR) -platform=$(LEVEL) -parameter-names=../../src/Mono.Android/Profiles/api-$(LEVEL).params.txt > $(CLASS_PARSE_XML) || rm -f $(CLASS_PARSE_XML)

$(ANALYZED_XML): $(API_XML_TOOL) $(CLASS_PARSE_XML)
mkdir -p $(ANALYZED_XML_DIR)
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 1bcfcc to e1ad50
18,213 changes: 18,213 additions & 0 deletions src/Mono.Android/Profiles/api-10.params.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/Mono.Android/Profiles/api-10.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74239,11 +74239,11 @@
</field>
<field deprecated="not deprecated" final="true" name="MIN_VALUE" static="true" transient="false" type="float" type-generic-aware="float" value="1.401298E-45" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="NEGATIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="-Infinity" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="NEGATIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="(-1.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="NaN" static="true" transient="false" type="float" type-generic-aware="float" value="NaN" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="NaN" static="true" transient="false" type="float" type-generic-aware="float" value="(0.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="POSITIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="Infinity" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="POSITIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="(1.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="SIZE" static="true" transient="false" type="int" type-generic-aware="int" value="32" visibility="public" volatile="false">
</field>
Expand Down
20,610 changes: 20,610 additions & 0 deletions src/Mono.Android/Profiles/api-15.params.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/Mono.Android/Profiles/api-15.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91506,11 +91506,11 @@
</field>
<field deprecated="not deprecated" final="true" name="MIN_VALUE" static="true" transient="false" type="float" type-generic-aware="float" value="1.401298E-45" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="NEGATIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="-Infinity" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="NEGATIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="(-1.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="NaN" static="true" transient="false" type="float" type-generic-aware="float" value="NaN" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="NaN" static="true" transient="false" type="float" type-generic-aware="float" value="(0.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="POSITIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="Infinity" visibility="public" volatile="false">
<field deprecated="not deprecated" final="true" name="POSITIVE_INFINITY" static="true" transient="false" type="float" type-generic-aware="float" value="(1.0f / 0.0f)" visibility="public" volatile="false">
</field>
<field deprecated="not deprecated" final="true" name="SIZE" static="true" transient="false" type="int" type-generic-aware="int" value="32" visibility="public" volatile="false">
</field>
Expand Down
Loading