[GitHub] aaronmarkham closed pull request #13820: Fix scala doc build break for v1.3.1

[GitBox <gi...@apache.org>]

aaronmarkham closed pull request #13820: Fix scala doc build break for v1.3.1
URL: https://github.com/apache/incubator-mxnet/pull/13820
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/docs/mxdoc.py b/docs/mxdoc.py
index 58e603ed017..52f050e0ad2 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))


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services