[incubator-singa] branch master updated: SINGA-420 Add build command and links for C++ Doxygen documentation

[wa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wangwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-singa.git


The following commit(s) were added to refs/heads/master by this push:
     new a7948cc  SINGA-420 Add build command and links for C++ Doxygen documentation
     new 45a608f  Merge pull request #447 from moazreyad/SINGA-420
a7948cc is described below

commit a7948ccbaed806728f85090d07cb3ec3d2b2800f
Author: Moaz Reyad <mo...@apache.org>
AuthorDate: Mon Apr 1 01:39:01 2019 +0200

    SINGA-420 Add build command and links for C++ Doxygen documentation
---
 doc/build.sh     | 1 +
 doc/en/index.rst | 2 +-
 doc/zh/index.rst | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/build.sh b/doc/build.sh
old mode 100755
new mode 100644
index 44eb1c2..c00be39
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -36,4 +36,5 @@ if [ "$1"x = "html"x ]; then
     $SPHINXBUILD -b html -c . -d $BUILDDIR/doctree ${LANG_ARR[i]} $BUILDDIR/html/${LANG_ARR[i]}
   done
   echo "<script language=\"javascript\" type=\"text/javascript\">window.location.href='en/index.html';</script>" > $BUILDDIR/html/index.html
+  ( cat Doxyfile ; echo "OUTPUT_DIRECTORY=$BUILDDIR/html/doxygen" ) | doxygen - 
 fi
diff --git a/doc/en/index.rst b/doc/en/index.rst
old mode 100755
new mode 100644
index 14e8fc6..056595c
--- a/doc/en/index.rst
+++ b/doc/en/index.rst
@@ -82,7 +82,7 @@ Documentation
 -------------
 
 * Documentation and Python APIs are listed `here <docs.html>`_.
-* `C++ APIs <http://www.comp.nus.edu.sg/~dbsystem/singa/api/>`_ are generated by Doxygen.
+* `C++ APIs <../doxygen/html/index.html>`_ are generated by Doxygen.
 * Research publication list is available `here <http://www.comp.nus.edu.sg/~dbsystem/singa/research/publication/>`_.
 
 How to contribute
diff --git a/doc/zh/index.rst b/doc/zh/index.rst
index aec5343..5a069e4 100644
--- a/doc/zh/index.rst
+++ b/doc/zh/index.rst
@@ -75,7 +75,7 @@ SINGA 入门
 -------------
 
 * `这里 <docs.html>`_ 列出了文档和 Python API.
-* `C++ APIs <http://www.comp.nus.edu.sg/~dbsystem/singa/api/>`_ 由 Doxygen 生成.
+* `C++ APIs <../doxygen/html/index.html>`_ 由 Doxygen 生成.
 * 研究出版物清单可在 `此处 <http://www.comp.nus.edu.sg/~dbsystem/singa/research/publication/>`_ 查阅.
 
 如何贡献