You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by ms...@apache.org on 2020/03/22 03:52:46 UTC
[incubator-teaclave] 01/02: [edl] Rename edls to edl
This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
commit bb02449aabcceb5939f3fdcaf5662f7c98659b38
Author: Mingshen Sun <bo...@mssun.me>
AuthorDate: Sat Mar 21 18:30:56 2020 -0700
[edl] Rename edls to edl
---
cmake/TeaclaveGenVars.cmake | 2 +-
cmake/scripts/prep.sh | 4 ++--
{edls => edl}/Enclave_common.edl | 0
{edls => edl}/Enclave_fa.edl | 0
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/TeaclaveGenVars.cmake b/cmake/TeaclaveGenVars.cmake
index 31dc5b0..7bef064 100644
--- a/cmake/TeaclaveGenVars.cmake
+++ b/cmake/TeaclaveGenVars.cmake
@@ -30,7 +30,7 @@ set(MT_SCRIPT_DIR ${PROJECT_SOURCE_DIR}/cmake/scripts)
set(MT_UNIX_TOML_DIR ${PROJECT_BINARY_DIR}/cmake_tomls/unix_app)
set(MT_SGXLIB_TOML_DIR ${PROJECT_BINARY_DIR}/cmake_tomls/sgx_trusted_lib)
set(MT_SGXAPP_TOML_DIR ${PROJECT_BINARY_DIR}/cmake_tomls/sgx_untrusted_app)
-set(MT_EDL_FILE ${PROJECT_SOURCE_DIR}/edls/Enclave_common.edl ${PROJECT_SOURCE_DIR}/edls/Enclave_fa.edl)
+set(MT_EDL_FILE ${PROJECT_SOURCE_DIR}/edl/Enclave_common.edl ${PROJECT_SOURCE_DIR}/edl/Enclave_fa.edl)
join_string("${MT_EDL_FILE}" " " MT_EDL_FILE)
set(SGX_EDGER8R ${SGX_SDK}/bin/x64/sgx_edger8r)
diff --git a/cmake/scripts/prep.sh b/cmake/scripts/prep.sh
index 820b137..5e0ee25 100755
--- a/cmake/scripts/prep.sh
+++ b/cmake/scripts/prep.sh
@@ -53,7 +53,7 @@ fi
if [ ! -f ${TEACLAVE_OUT_DIR}/libEnclave_common_u.a ]; then
echo 'INFO: Start to build EDL.'
${SGX_EDGER8R} --untrusted ${MT_EDL_FILE} --search-path ${SGX_SDK}/include \
- --search-path ${RUST_SGX_SDK}/edl --search-path ${TEACLAVE_PROJECT_ROOT}/edls \
+ --search-path ${RUST_SGX_SDK}/edl --search-path ${TEACLAVE_PROJECT_ROOT}/edl \
--untrusted-dir ${TEACLAVE_OUT_DIR}
cd ${TEACLAVE_OUT_DIR}
${CMAKE_C_COMPILER} ${SGX_UNTRUSTED_CFLAGS} -c Enclave_common_u.c -o libEnclave_common_u.o
@@ -63,7 +63,7 @@ if [ ! -f ${TEACLAVE_OUT_DIR}/libEnclave_common_u.a ]; then
${CMAKE_AR} rcsD libEnclave_fa_u.a libEnclave_fa_u.o
${SGX_EDGER8R} --trusted ${MT_EDL_FILE} --search-path ${SGX_SDK}/include \
- --search-path ${RUST_SGX_SDK}/edl --search-path ${TEACLAVE_PROJECT_ROOT}/edls \
+ --search-path ${RUST_SGX_SDK}/edl --search-path ${TEACLAVE_PROJECT_ROOT}/edl \
--trusted-dir ${TEACLAVE_OUT_DIR}
${CMAKE_C_COMPILER} ${SGX_TRUSTED_CFLAGS} -c Enclave_common_t.c -o libEnclave_common_t.o
${CMAKE_C_COMPILER} ${SGX_TRUSTED_CFLAGS} -c Enclave_fa_t.c -o libEnclave_fa_t.o
diff --git a/edls/Enclave_common.edl b/edl/Enclave_common.edl
similarity index 100%
rename from edls/Enclave_common.edl
rename to edl/Enclave_common.edl
diff --git a/edls/Enclave_fa.edl b/edl/Enclave_fa.edl
similarity index 100%
rename from edls/Enclave_fa.edl
rename to edl/Enclave_fa.edl
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org