From 2dec4be1db404db565f8a9a4253e1aa615777007 Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Tue, 8 Aug 2017 15:18:18 +0800
Subject: [PATCH] * fix travis-ci bug * remove external_project_dependencies
 for proto/CMakeLists.txt

---
 doc/templates/conf.py.cn.in        | 9 +++------
 doc/templates/conf.py.en.in        | 9 +++------
 paddle/scripts/travis/build_doc.sh | 1 -
 proto/CMakeLists.txt               | 2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/doc/templates/conf.py.cn.in b/doc/templates/conf.py.cn.in
index 0faa3c78d61..673948dfe79 100644
--- a/doc/templates/conf.py.cn.in
+++ b/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'))
-try:
-   import paddle
-   import paddle.v2
-except ImportError:
-   sys.exit(1)
+import paddle
+import paddle.v2
 
 MarkdownParser = parser.CommonMarkParser
 AutoStructify = transform.AutoStructify
diff --git a/doc/templates/conf.py.en.in b/doc/templates/conf.py.en.in
index 23d73189d92..b6b50b7dcd5 100644
--- a/doc/templates/conf.py.en.in
+++ b/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'))
-try:
-   import paddle
-   import paddle.v2
-except ImportError:
-   sys.exit(1)
+import paddle
+import paddle.v2
 
 
 MarkdownParser = parser.CommonMarkParser
diff --git a/paddle/scripts/travis/build_doc.sh b/paddle/scripts/travis/build_doc.sh
index 837adaab984..dfcff383027 100755
--- a/paddle/scripts/travis/build_doc.sh
+++ b/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
 
diff --git a/proto/CMakeLists.txt b/proto/CMakeLists.txt
index 18584cafe79..e1cea8bd0de 100644
--- a/proto/CMakeLists.txt
+++ b/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})
-- 
GitLab