From df739db9fe0e71c5a5d18854b67f155d7c34fe5c Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Thu, 24 Aug 2017 23:11:20 +0200 Subject: [PATCH] move proxy -- rust version -- to the dirctory proxy - ignore C version and build only Rust-based proxy --- CMakeLists.txt | 2 +- proxy/.gitignore | 2 ++ {tools/hermit_proxy => proxy}/CMakeLists.txt | 4 ++-- {tools/hermit_proxy => proxy}/Cargo.toml | 2 +- {tools/hermit_proxy => proxy}/cmake/Findcargo.cmake | 0 {tools/hermit_proxy => proxy}/cmake/Findrustc.cmake | 0 {tools/hermit_proxy => proxy}/cmake/Findrustdoc.cmake | 0 {tools/hermit_proxy => proxy}/cmake/Rust.cmake | 0 {tools/hermit_proxy => proxy}/src/daemon.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/error.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/mod.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/multi.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/proto.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/qemu.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/socket.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/gdt.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/kvm_header.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/mod.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/proto.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/uhyve.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/vcpu.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/uhyve/vm.rs | 0 {tools/hermit_proxy => proxy}/src/hermit/utils.rs | 0 {tools/hermit_proxy => proxy}/src/main.rs | 0 tools/CMakeLists.txt | 1 - 25 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 proxy/.gitignore rename {tools/hermit_proxy => proxy}/CMakeLists.txt (88%) rename {tools/hermit_proxy => proxy}/Cargo.toml (93%) rename {tools/hermit_proxy => proxy}/cmake/Findcargo.cmake (100%) rename {tools/hermit_proxy => proxy}/cmake/Findrustc.cmake (100%) rename {tools/hermit_proxy => proxy}/cmake/Findrustdoc.cmake (100%) rename {tools/hermit_proxy => proxy}/cmake/Rust.cmake (100%) rename {tools/hermit_proxy => proxy}/src/daemon.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/error.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/mod.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/multi.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/proto.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/qemu.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/socket.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/gdt.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/kvm_header.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/mod.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/proto.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/uhyve.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/vcpu.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/uhyve/vm.rs (100%) rename {tools/hermit_proxy => proxy}/src/hermit/utils.rs (100%) rename {tools/hermit_proxy => proxy}/src/main.rs (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 65cdc03cd..bea2e2ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,7 +133,7 @@ add_custom_target(hermit # be relocated for installation ## HermitCore's own tools such as Qemu/KVM proxy -build_external(tools ${HERMIT_ROOT}/tools "") +build_external(proxy ${HERMIT_ROOT}/proxy "") build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86/loader "") ## Intel's OpenMP runtime for x86 (libomp) diff --git a/proxy/.gitignore b/proxy/.gitignore new file mode 100644 index 000000000..1e7caa9ea --- /dev/null +++ b/proxy/.gitignore @@ -0,0 +1,2 @@ +Cargo.lock +target/ diff --git a/tools/hermit_proxy/CMakeLists.txt b/proxy/CMakeLists.txt similarity index 88% rename from tools/hermit_proxy/CMakeLists.txt rename to proxy/CMakeLists.txt index a8420f00e..11b8da2bc 100755 --- a/tools/hermit_proxy/CMakeLists.txt +++ b/proxy/CMakeLists.txt @@ -13,7 +13,7 @@ include(Rust) # PACKAGE_VERSIONS =0.5.2 =0.2.22 =0.8 =0.0.10 =0.2.3 =0.4 =1 =0.3 =0.3) ExternalProject_Add( - hermit_proxy + proxy DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND cargo build @@ -21,4 +21,4 @@ ExternalProject_Add( INSTALL_COMMAND "" LOG_BUILD ON) -install(PROGRAMS target/debug/hermit_proxy DESTINATION bin) +install(PROGRAMS target/debug/proxy DESTINATION bin) diff --git a/tools/hermit_proxy/Cargo.toml b/proxy/Cargo.toml similarity index 93% rename from tools/hermit_proxy/Cargo.toml rename to proxy/Cargo.toml index ec59bdb38..820b8aa2f 100755 --- a/tools/hermit_proxy/Cargo.toml +++ b/proxy/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "hermit_proxy" +name = "proxy" version = "0.0.1" authors = ["bytesnake "] diff --git a/tools/hermit_proxy/cmake/Findcargo.cmake b/proxy/cmake/Findcargo.cmake similarity index 100% rename from tools/hermit_proxy/cmake/Findcargo.cmake rename to proxy/cmake/Findcargo.cmake diff --git a/tools/hermit_proxy/cmake/Findrustc.cmake b/proxy/cmake/Findrustc.cmake similarity index 100% rename from tools/hermit_proxy/cmake/Findrustc.cmake rename to proxy/cmake/Findrustc.cmake diff --git a/tools/hermit_proxy/cmake/Findrustdoc.cmake b/proxy/cmake/Findrustdoc.cmake similarity index 100% rename from tools/hermit_proxy/cmake/Findrustdoc.cmake rename to proxy/cmake/Findrustdoc.cmake diff --git a/tools/hermit_proxy/cmake/Rust.cmake b/proxy/cmake/Rust.cmake similarity index 100% rename from tools/hermit_proxy/cmake/Rust.cmake rename to proxy/cmake/Rust.cmake diff --git a/tools/hermit_proxy/src/daemon.rs b/proxy/src/daemon.rs similarity index 100% rename from tools/hermit_proxy/src/daemon.rs rename to proxy/src/daemon.rs diff --git a/tools/hermit_proxy/src/hermit/error.rs b/proxy/src/hermit/error.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/error.rs rename to proxy/src/hermit/error.rs diff --git a/tools/hermit_proxy/src/hermit/mod.rs b/proxy/src/hermit/mod.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/mod.rs rename to proxy/src/hermit/mod.rs diff --git a/tools/hermit_proxy/src/hermit/multi.rs b/proxy/src/hermit/multi.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/multi.rs rename to proxy/src/hermit/multi.rs diff --git a/tools/hermit_proxy/src/hermit/proto.rs b/proxy/src/hermit/proto.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/proto.rs rename to proxy/src/hermit/proto.rs diff --git a/tools/hermit_proxy/src/hermit/qemu.rs b/proxy/src/hermit/qemu.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/qemu.rs rename to proxy/src/hermit/qemu.rs diff --git a/tools/hermit_proxy/src/hermit/socket.rs b/proxy/src/hermit/socket.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/socket.rs rename to proxy/src/hermit/socket.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/gdt.rs b/proxy/src/hermit/uhyve/gdt.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/gdt.rs rename to proxy/src/hermit/uhyve/gdt.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/kvm_header.rs b/proxy/src/hermit/uhyve/kvm_header.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/kvm_header.rs rename to proxy/src/hermit/uhyve/kvm_header.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/mod.rs b/proxy/src/hermit/uhyve/mod.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/mod.rs rename to proxy/src/hermit/uhyve/mod.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/proto.rs b/proxy/src/hermit/uhyve/proto.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/proto.rs rename to proxy/src/hermit/uhyve/proto.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/uhyve.rs b/proxy/src/hermit/uhyve/uhyve.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/uhyve.rs rename to proxy/src/hermit/uhyve/uhyve.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/vcpu.rs b/proxy/src/hermit/uhyve/vcpu.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/vcpu.rs rename to proxy/src/hermit/uhyve/vcpu.rs diff --git a/tools/hermit_proxy/src/hermit/uhyve/vm.rs b/proxy/src/hermit/uhyve/vm.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/uhyve/vm.rs rename to proxy/src/hermit/uhyve/vm.rs diff --git a/tools/hermit_proxy/src/hermit/utils.rs b/proxy/src/hermit/utils.rs similarity index 100% rename from tools/hermit_proxy/src/hermit/utils.rs rename to proxy/src/hermit/utils.rs diff --git a/tools/hermit_proxy/src/main.rs b/proxy/src/main.rs similarity index 100% rename from tools/hermit_proxy/src/main.rs rename to proxy/src/main.rs diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 31e6862c0..8a9162068 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -15,7 +15,6 @@ install(TARGETS proxy install(FILES init.sh DESTINATION tools) -add_subdirectory(./hermit_proxy) # Show include files in IDE file(GLOB_RECURSE TOOLS_INCLUDES "*.h") add_custom_target(tools_includes_ide SOURCES ${TOOLS_INCLUDES})