You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by aa...@apache.org on 2019/01/10 23:42:37 UTC
[incubator-mxnet] branch master updated: Fix scala doc build break
for v1.3.1 (#13820)
This is an automated email from the ASF dual-hosted git repository.
aaronmarkham pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 5aeed01 Fix scala doc build break for v1.3.1 (#13820)
5aeed01 is described below
commit 5aeed0139f37a93f43b942e7a2bf10695d14bf78
Author: Frank Liu <fr...@gmail.com>
AuthorDate: Thu Jan 10 15:42:22 2019 -0800
Fix scala doc build break for v1.3.1 (#13820)
* Fix doc build break for v1.3.1
* ignore errors on v1.3.x during scala docs gen
---
docs/mxdoc.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/mxdoc.py b/docs/mxdoc.py
index 58e603e..52f050e 100644
--- a/docs/mxdoc.py
+++ b/docs/mxdoc.py
@@ -113,12 +113,12 @@ def build_scala_docs(app):
scala_doc_sources = 'find . -type f -name "*.scala" | egrep \"\.\/core|\.\/infer\" | egrep -v \"\/javaapi\" | egrep -v \"Suite\"'
scala_doc_classpath = ':'.join([
'`find native -name "*.jar" | grep "target/lib/" | tr "\\n" ":" `',
- '`find macros -name "*-INTERNAL.jar" | tr "\\n" ":" `',
- '`find core -name "*-INTERNAL.jar" | tr "\\n" ":" `',
- '`find infer -name "*-INTERNAL.jar" | tr "\\n" ":" `'
+ '`find macros -name "*.jar" | tr "\\n" ":" `',
+ '`find core -name "*.jar" | tr "\\n" ":" `',
+ '`find infer -name "*.jar" | tr "\\n" ":" `'
])
# There are unresolvable errors on mxnet 1.2.x. We are ignoring those errors while aborting the ci on newer versions
- scala_ignore_errors = '; exit 0' if '1.2.' in _BUILD_VER else ''
+ scala_ignore_errors = '; exit 0' if '1.2.' or '1.3.' in _BUILD_VER else ''
_run_cmd('cd {}; scaladoc `{}` -classpath {} -feature -deprecation {}'
.format(scala_path, scala_doc_sources, scala_doc_classpath, scala_ignore_errors))
dest_path = app.builder.outdir + '/api/scala/docs'
@@ -135,9 +135,9 @@ def build_java_docs(app):
java_doc_sources = 'find . -type f -name "*.scala" | egrep \"\.\/core|\.\/infer\" | egrep \"\/javaapi\" | egrep -v \"Suite\"'
java_doc_classpath = ':'.join([
'`find native -name "*.jar" | grep "target/lib/" | tr "\\n" ":" `',
- '`find macros -name "*-INTERNAL.jar" | tr "\\n" ":" `',
- '`find core -name "*-INTERNAL.jar" | tr "\\n" ":" `',
- '`find infer -name "*-INTERNAL.jar" | tr "\\n" ":" `'
+ '`find macros -name "*.jar" | tr "\\n" ":" `',
+ '`find core -name "*.jar" | tr "\\n" ":" `',
+ '`find infer -name "*.jar" | tr "\\n" ":" `'
])
_run_cmd('cd {}; scaladoc `{}` -classpath {} -feature -deprecation'
.format(java_path, java_doc_sources, java_doc_classpath))