You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by hs...@apache.org on 2023/06/15 06:08:49 UTC
[incubator-teaclave-website] 07/07: Upload documents
This is an automated email from the ASF dual-hosted git repository.
hsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-website.git
commit fd8047a66a69e2710926ea6c4fd19e8d33ef56a6
Author: sunhe05 <su...@baidu.com>
AuthorDate: Thu Jun 15 04:08:22 2023 +0000
Upload documents
---
README.md | 4 +-
sgx-sdk-api-docs/Cargo.lock | 125 +++++++++++++++++++++++++++-------------
sgx-sdk-api-docs/Cargo.toml | 8 +--
sgx-sdk-api-docs/rust-toolchain | 2 +-
site/.vuepress/config.js | 1 -
site/Makefile | 14 ++---
6 files changed, 98 insertions(+), 56 deletions(-)
diff --git a/README.md b/README.md
index 6afc3a642..d4cdfde50 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@ make dev
To commit generated files to the `asf-staging` and `asf-site` branches you can call:
```
-TEACLAVE_TARGET_DIR=xxx make asf-staging
-TEACLAVE_TARGET_DIR=xxx make asf-site
+TEACLAVE_TARGET_DIR=xxx make staging
+TEACLAVE_TARGET_DIR=xxx make site
```
This command will also copy the document generated by Teaclave. Therefore,
diff --git a/sgx-sdk-api-docs/Cargo.lock b/sgx-sdk-api-docs/Cargo.lock
index 54c9ef72e..b298f80e1 100644
--- a/sgx-sdk-api-docs/Cargo.lock
+++ b/sgx-sdk-api-docs/Cargo.lock
@@ -1,86 +1,129 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
-[[package]]
-name = "cc"
-version = "1.0.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bbb73db36c1246e9034e307d0fba23f9a2e251faa47ade70c1bd252220c8311"
+version = 3
[[package]]
name = "hashbrown_tstd"
-version = "0.9.0"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "0.12.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
[[package]]
name = "sgx_alloc"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+
+[[package]]
+name = "sgx_build_helper"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+
+[[package]]
+name = "sgx_crypto"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+dependencies = [
+ "sgx_crypto_sys",
+ "sgx_trts",
+ "sgx_types",
+]
[[package]]
-name = "sgx_backtrace_sys"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+name = "sgx_crypto_sys"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
- "cc",
"sgx_build_helper",
- "sgx_libc",
+ "sgx_download_prebuilt",
+ "sgx_types",
]
[[package]]
-name = "sgx_build_helper"
-version = "0.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+name = "sgx_download_prebuilt"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+dependencies = [
+ "sgx_build_helper",
+]
+
+[[package]]
+name = "sgx_ffi"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+dependencies = [
+ "sgx_types",
+]
[[package]]
-name = "sgx_demangle"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+name = "sgx_oc"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+dependencies = [
+ "sgx_ffi",
+ "sgx_sync",
+ "sgx_trts",
+ "sgx_types",
+]
[[package]]
-name = "sgx_libc"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+name = "sgx_rsrvmm"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
+ "sgx_sync",
+ "sgx_trts",
"sgx_types",
]
[[package]]
-name = "sgx_tprotected_fs"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+name = "sgx_sync"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
"sgx_trts",
"sgx_types",
]
+[[package]]
+name = "sgx_tlibc_sys"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
+dependencies = [
+ "sgx_build_helper",
+ "sgx_download_prebuilt",
+ "sgx_types",
+]
+
[[package]]
name = "sgx_trts"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
- "sgx_libc",
+ "sgx_crypto_sys",
+ "sgx_tlibc_sys",
"sgx_types",
]
[[package]]
name = "sgx_tse"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
+ "sgx_crypto",
+ "sgx_trts",
"sgx_types",
]
[[package]]
name = "sgx_tstd"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
"hashbrown_tstd",
"sgx_alloc",
- "sgx_backtrace_sys",
- "sgx_demangle",
- "sgx_libc",
- "sgx_tprotected_fs",
+ "sgx_ffi",
+ "sgx_oc",
+ "sgx_rsrvmm",
+ "sgx_sync",
"sgx_trts",
"sgx_types",
"sgx_unwind",
@@ -88,13 +131,13 @@ dependencies = [
[[package]]
name = "sgx_types"
-version = "1.1.3"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
[[package]]
name = "sgx_unwind"
-version = "0.1.1"
-source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?tag=v1.1.3#a6a172e652b4db4eaa17e4faa078fda8922abdd0"
+version = "2.0.0"
+source = "git+https://github.com/apache/incubator-teaclave-sgx-sdk.git?branch=v2.0.0-preview#5fd7766403ce313c9d5c0fe98a9cdb19809c2de2"
dependencies = [
"sgx_build_helper",
]
diff --git a/sgx-sdk-api-docs/Cargo.toml b/sgx-sdk-api-docs/Cargo.toml
index 318ae7f16..1984d5717 100644
--- a/sgx-sdk-api-docs/Cargo.toml
+++ b/sgx-sdk-api-docs/Cargo.toml
@@ -2,12 +2,12 @@
name = "teaclave-sgx-sdk-docs"
version = "0.1.0"
authors = ["Teaclave Contributors <de...@teaclave.apache.org>"]
-edition = "2018"
+edition = "2021"
[lib]
path = "lib.rs"
[dependencies]
-sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", tag = "v1.1.3" }
-sgx_trts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", tag = "v1.1.3" }
-sgx_tse = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", tag = "v1.1.3" }
+sgx_tstd = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", branch = "v2.0.0-preview" }
+sgx_trts = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", branch = "v2.0.0-preview" }
+sgx_tse = { git = "https://github.com/apache/incubator-teaclave-sgx-sdk.git", branch = "v2.0.0-preview" }
diff --git a/sgx-sdk-api-docs/rust-toolchain b/sgx-sdk-api-docs/rust-toolchain
index 148ed93db..cd5e8eb24 100644
--- a/sgx-sdk-api-docs/rust-toolchain
+++ b/sgx-sdk-api-docs/rust-toolchain
@@ -1 +1 @@
-nightly-2020-10-25
+nightly-2022-10-22
diff --git a/site/.vuepress/config.js b/site/.vuepress/config.js
index 9f95cda15..75d6630a6 100644
--- a/site/.vuepress/config.js
+++ b/site/.vuepress/config.js
@@ -142,7 +142,6 @@ module.exports = {
'/teaclave/executor/',
'/teaclave/file_agent/',
'/teaclave/function/',
- '/teaclave/keys/',
'/teaclave/rpc/',
'/teaclave/runtime/',
'/teaclave/sdk/',
diff --git a/site/Makefile b/site/Makefile
index 635821601..f5d77ac03 100644
--- a/site/Makefile
+++ b/site/Makefile
@@ -22,7 +22,8 @@ trustzone-sdk-api-docs: teaclave-docs
@echo "<meta http-equiv=refresh content=0;url=`echo optee_teec | cut -d '/' -f 2`/index.html>" > .vuepress/dist/api-docs/trustzone-sdk/optee-teec/index.html
client-sdk-python-docs: teaclave-docs
- pdoc teaclave/sdk/python/teaclave.py -o .vuepress/dist/api-docs/client-sdk-python
+ python3 -m grpc_tools.protoc --proto_path=teaclave/services/proto/src/proto --python_out=teaclave/sdk/python --grpclib_python_out=teaclave/sdk/python teaclave/services/proto/src/proto/*.proto
+ PYTHONPATH=teaclave/sdk/python pdoc teaclave/sdk/python/teaclave.py -o .vuepress/dist/api-docs/client-sdk-python
@echo "<meta http-equiv=refresh content=0;url=python/teaclave.html>" > .vuepress/dist/api-docs/client-sdk-python/index.html
client-sdk-rust-docs: teaclave-docs
@@ -34,21 +35,20 @@ client-sdk-rust-docs: teaclave-docs
@echo "<meta http-equiv=refresh content=0;url=`echo teaclave_client_sdk | cut -d '/' -f 2`/index.html>" > .vuepress/dist/api-docs/client-sdk-rust/index.html
crate-docs:
- cp ${TEACLAVE_TARGET_DIR}/trusted/doc .vuepress/dist/api-docs/crates-enclave -r
- cp ${TEACLAVE_TARGET_DIR}/untrusted/doc .vuepress/dist/api-docs/crates-app -r
+ cp ${TEACLAVE_TARGET_DIR}/docs/enclave .vuepress/dist/api-docs/crates-enclave -r
+ cp ${TEACLAVE_TARGET_DIR}/docs/app .vuepress/dist/api-docs/crates-app -r
teaclave-docs:
git clone https://github.com/apache/incubator-teaclave.git teaclave || cd teaclave && git pull
- git clone https://github.com/apache/incubator-teaclave-sgx-sdk.git teaclave-sgx-sdk || cd teaclave-sgx-sdk && git pull
- git clone https://github.com/apache/incubator-teaclave-trustzone-sdk.git teaclave-trustzone-sdk
- cd teaclave-trustzone-sdk && git checkout 38452505f36e2a49279fbfcb7199147cf1190a95
+ git clone -b v2.0.0-preview https://github.com/apache/incubator-teaclave-sgx-sdk.git teaclave-sgx-sdk || cd teaclave-sgx-sdk && git pull
+ git clone https://github.com/apache/incubator-teaclave-trustzone-sdk.git teaclave-trustzone-sdk || cd teaclave-trustzone-sdk && git pull
vuepress build
dev:
git clone https://github.com/apache/incubator-teaclave.git teaclave || cd teaclave && git pull
git clone https://github.com/apache/incubator-teaclave-sgx-sdk.git teaclave-sgx-sdk || cd teaclave-sgx-sdk && git pull
git clone https://github.com/apache/incubator-teaclave-trustzone-sdk.git teaclave-trustzone-sdk
- cd teaclave-trustzone-sdk && git checkout 38452505f36e2a49279fbfcb7199147cf1190a95
+ cd teaclave-trustzone-sdk
vuepress dev
preview:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org