[incubator-mesatee] branch master updated: [build] Copy doc to release directory. (#136)

[ms...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d287298  [build] Copy doc to release directory. (#136)
d287298 is described below

commit d287298bd6cffa3c943aa9603c19371aa7a5dfbc
Author: Rundong Zhou <ru...@gmail.com>
AuthorDate: Mon Dec 9 16:03:03 2019 -0800

    [build] Copy doc to release directory. (#136)
---
 cmake/UtilTargets.cmake | 3 ++-
 cmake/scripts/prep.sh   | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/UtilTargets.cmake b/cmake/UtilTargets.cmake
index 64aae55..8bfaf24 100644
--- a/cmake/UtilTargets.cmake
+++ b/cmake/UtilTargets.cmake
@@ -47,7 +47,8 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
 # doc target
 add_custom_target(doc
     COMMAND cd ${PROJECT_BINARY_DIR}/cmake_tomls/unix_app &&
-        ${MESATEE_COMMON_ENVS} cargo doc --all ${CARGO_BUILD_FLAGS} ${MTEE_EXTRA_CARGO_FLAGS}
+        ${MESATEE_COMMON_ENVS} cargo doc --all ${CARGO_BUILD_FLAGS} ${MTEE_EXTRA_CARGO_FLAGS} &&
+        cp -RT ${PROJECT_BINARY_DIR}/cmake_tomls/unix_app/target/doc ${MESATEE_DOC_INSTALL_DIR}
     DEPENDS prep ${TARGET_CONFIG_GEN}
 )
 
diff --git a/cmake/scripts/prep.sh b/cmake/scripts/prep.sh
index 2d4f81b..db2f8f9 100755
--- a/cmake/scripts/prep.sh
+++ b/cmake/scripts/prep.sh
@@ -5,7 +5,7 @@ REQUIRED_ENVS=("CMAKE_SOURCE_DIR" "CMAKE_BINARY_DIR"
 "SGX_EDGER8R" "MT_EDL_FILE" "SGX_SDK" "RUST_SGX_SDK" "CMAKE_C_COMPILER"
 "CMAKE_AR" "SGX_UNTRUSTED_CFLAGS" "SGX_TRUSTED_CFLAGS" "MT_SCRIPT_DIR"
 "MESATEE_SERVICE_INSTALL_DIR" "MESATEE_EXAMPLE_INSTALL_DIR" "MESATEE_BIN_INSTALL_DIR"
-"MESATEE_LIB_INSTALL_DIR" "MESATEE_DOC_INSTALL_DIR" "MESATEE_TEST_INSTALL_DIR"
+"MESATEE_LIB_INSTALL_DIR" "MESATEE_TEST_INSTALL_DIR"
 "MESATEE_AUDITORS_DIR" "MESATEE_EXAMPLE_AUDITORS_DIR"
 )
 
@@ -16,8 +16,7 @@ done
 ${MT_SCRIPT_DIR}/setup_cmake_tomls ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} 
 mkdir -p ${MESATEE_OUT_DIR} ${MESATEE_TARGET_DIR} ${MESATEE_SERVICE_INSTALL_DIR} \
     ${MESATEE_EXAMPLE_INSTALL_DIR} ${MESATEE_BIN_INSTALL_DIR} ${MESATEE_LIB_INSTALL_DIR} \
-    ${MESATEE_DOC_INSTALL_DIR} ${MESATEE_TEST_INSTALL_DIR} ${MESATEE_AUDITORS_DIR} \
-    ${MESATEE_EXAMPLE_AUDITORS_DIR}
+    ${MESATEE_TEST_INSTALL_DIR} ${MESATEE_AUDITORS_DIR} ${MESATEE_EXAMPLE_AUDITORS_DIR}
 # copy auditors to install directory to make it easy to package all built things
 cp -RT ${CMAKE_SOURCE_DIR}/auditors/ ${MESATEE_AUDITORS_DIR}/
 # create the following symlinks to make remapped paths accessible and avoid repeated building


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@mesatee.apache.org
For additional commands, e-mail: commits-help@mesatee.apache.org