Merge #353

353: Fix doc generation r=jethrogb a=raoulstrackx



Co-authored-by: Raoul Strackx <[email protected]>

Author: bors[bot]

.travis.yml

@@ -28,9 +28,8 @@ matrix:
         - RUST_BACKTRACE=1 LLVM_CONFIG_PATH=llvm-3.8-config
       before_script:
         - rustup target add x86_64-fortanix-unknown-sgx x86_64-unknown-linux-musl
-        - cd intel-sgx
       script:
-        - cargo test --verbose --locked --all --exclude sgxs-loaders && [ "$(echo $(nm -D ../target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
+        - cargo test --verbose --locked --all --exclude sgxs-loaders && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
         - cargo test --verbose --locked -p sgx-isa --features sgxstd --target x86_64-fortanix-unknown-sgx --no-run
         - cargo test --verbose --locked -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx
         - cargo test --verbose --locked -p dcap-ql --features link
@@ -40,3 +39,4 @@ matrix:
         # NOTE: linking glibc version of OpenSSL with musl binary.
         # Unlikely to produce a working binary, but at least the build succeeds.
         - mkdir -p /tmp/muslinclude && ln -sf /usr/include/x86_64-linux-gnu/openssl /tmp/muslinclude/openssl && PKG_CONFIG_ALLOW_CROSS=1 CFLAGS=-I/tmp/muslinclude cargo build --locked -p fortanix-sgx-tools --target x86_64-unknown-linux-musl
+        - ./doc/generate-api-docs.sh

Cargo.toml

@@ -15,7 +15,7 @@ members = [
     "intel-sgx/report-test",
     "intel-sgx/sgxs",
     "intel-sgx/sgx-isa",
-    "intel-sgx/sgx-pkix",
+    "intel-sgx/sgx_pkix",
     "intel-sgx/sgxs-loaders",
     "intel-sgx/sgxs-tools",
     "ipc-queue",

doc/generate-api-docs.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 cd "$(readlink -f "$(dirname "$0")/..")"
 
@@ -50,7 +50,8 @@ LIBS_SORTED=$(
 )
 
 for LIB in $LIBS_SORTED; do
-    cd $LIB
+    LIB_DIR=$(find . -maxdepth 2 -name ${LIB} -type d)
+    cd ${LIB_DIR}
     ARGS=""
     if FEATURES="$(cargo read-manifest|jq -r '.metadata.docs.rs.features | join(",")' 2> /dev/null)"; then
         ARGS="--features $FEATURES"

fortanix-vme/tests/incoming_connection/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "incoming_connection"
 version = "0.1.0"
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

fortanix-vme/tests/outgoing_connection/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "outgoing_connection"
 version = "0.1.0"
-edition = "2021"
+edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

intel-sgx/sgx-pkix/Cargo.toml intel-sgx/sgx_pkix/Cargo.tomlintel-sgx/sgx-pkix/Cargo.toml renamed to intel-sgx/sgx_pkix/Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+# Unfortunately crates.io prevents us from changing the name to `sgx-pkix`
 name = "sgx_pkix"
 version = "0.1.1"
 authors = ["Fortanix, Inc."]