Merge #344

344: Restructuring directory structure r=Pagten a=raoulstrackx

Places all IntelSGX related code into a separate directory. Following PRs will add a FortanixVME directory.

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

Author: bors[bot]

.travis.yml

@@ -28,8 +28,9 @@ 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

Cargo.toml

@@ -1,20 +1,20 @@
 [workspace]
 members = [
-    "aesm-client",
-    "dcap-provider",
-    "dcap-ql-sys",
-    "dcap-ql",
-    "dcap-retrieve-pckid",
-    "enclave-runner",
-    "fortanix-sgx-abi",
-    "fortanix-sgx-tools",
+    "intel-sgx/aesm-client",
+    "intel-sgx/dcap-provider",
+    "intel-sgx/dcap-ql-sys",
+    "intel-sgx/dcap-ql",
+    "intel-sgx/dcap-retrieve-pckid",
+    "intel-sgx/enclave-runner",
+    "intel-sgx/fortanix-sgx-abi",
+    "intel-sgx/fortanix-sgx-tools",
     "ipc-queue",
-    "report-test",
+    "intel-sgx/report-test",
     "rs-libc",
-    "sgxs",
-    "sgx-isa",
-    "sgx-pkix",
-    "sgxs-loaders",
-    "sgxs-tools"
+    "intel-sgx/sgxs",
+    "intel-sgx/sgx-isa",
+    "intel-sgx/sgx-pkix",
+    "intel-sgx/sgxs-loaders",
+    "intel-sgx/sgxs-tools"
 ]
 exclude = ["examples"]