* fix travis-ci bug

* remove external_project_dependencies for proto/CMakeLists.txt

doc/templates/conf.py.cn.in

@@ -13,14 +13,11 @@
 # serve to show the default.
 import sys
 import os, subprocess
+sys.path.insert(0, os.path.abspath('@PROJ_ROOT@/python'))
 import shlex
 from recommonmark import parser, transform
-sys.path.append(os.path.abspath('@PROJ_ROOT@/python'))
+import paddle
-try:
+import paddle.v2
-   import paddle
-   import paddle.v2
-except ImportError:
-   sys.exit(1)
 
 MarkdownParser = parser.CommonMarkParser
 AutoStructify = transform.AutoStructify

doc/templates/conf.py.en.in

@@ -13,14 +13,11 @@
 # serve to show the default.
 import sys
 import os, subprocess
+sys.path.insert(0, os.path.abspath('@PROJ_ROOT@/python'))
 import shlex
 from recommonmark import parser, transform
-sys.path.append(os.path.abspath('@PROJ_ROOT@/python'))
+import paddle
-try:
+import paddle.v2
-   import paddle
-   import paddle.v2
-except ImportError:
-   sys.exit(1)
 
 
 MarkdownParser = parser.CommonMarkParser

paddle/scripts/travis/build_doc.sh

@@ -7,7 +7,6 @@ cd $TRAVIS_BUILD_DIR/build
 
 # Compile Documentation only.
 cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_GPU=OFF -DWITH_MKLDNN=OFF -DWITH_MKLML=OFF -DWITH_DOC=ON
-make -j `nproc` paddle_proto
 make -j `nproc` gen_proto_py
 make -j `nproc` paddle_docs paddle_docs_cn
 

proto/CMakeLists.txt

@@ -17,7 +17,7 @@ foreach(filename ${proto_filenames})
             COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
             ARGS "--python_out=${PROJ_ROOT}/python/paddle/proto"
             "-I" ${CMAKE_CURRENT_SOURCE_DIR} ${ABS_FIL}
-            DEPENDS ${ABS_FIL} ${external_project_dependencies})
+            DEPENDS ${ABS_FIL} protoc)
 endforeach()
 
 add_custom_target(gen_proto_py ALL DEPENDS ${PROTO_GEN_PY})