Move the wasmtime crate directories form lib/* to wasmtime-*.

This follows a similar change to Cranelift made here: bytecodealliance/cranelift#660
yahoNanJing · Mar 20, 2019 · db0abe8 · db0abe8
1 parent 7b9761f
commit db0abe8
Show file tree

Hide file tree

Showing 74 changed files with 21 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "lib/wast/spec_testsuite"]
+[submodule "spec_testsuite"]
 	path = spec_testsuite
 	url = https://github.com/WebAssembly/testsuite
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,12 +25,12 @@ path = "src/wasm2obj.rs"
 [dependencies]
 cranelift-codegen = "0.29.0"
 cranelift-native = "0.29.0"
-wasmtime-debug = { path = "lib/debug" }
-wasmtime-environ = { path = "lib/environ" }
-wasmtime-runtime = { path = "lib/runtime" }
-wasmtime-jit = { path = "lib/jit" }
-wasmtime-obj = { path = "lib/obj" }
-wasmtime-wast = { path = "lib/wast" }
+wasmtime-debug = { path = "wasmtime-debug" }
+wasmtime-environ = { path = "wasmtime-environ" }
+wasmtime-runtime = { path = "wasmtime-runtime" }
+wasmtime-jit = { path = "wasmtime-jit" }
+wasmtime-obj = { path = "wasmtime-obj" }
+wasmtime-wast = { path = "wasmtime-wast" }
 docopt = "1.0.1"
 serde = "1.0.75"
 serde_derive = "1.0.75"

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 cargo-fuzz = true
 
 [dependencies]
-wasmtime-environ = { path = "../lib/environ" }
-wasmtime-jit = { path = "../lib/jit" }
+wasmtime-environ = { path = "../wasmtime-environ" }
+wasmtime-jit = { path = "../wasmtime-jit" }
 cranelift-codegen = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-native = "0.29.0"

diff --git a/publish-all.sh b/publish-all.sh
@@ -15,7 +15,7 @@ version="0.1.0"
 #
 # The main Cargo.toml in the top-level directory is the wasmtime-tools crate which we don't publish.
 echo "Updating crate versions to $version"
-for crate in . lib/*; do
+for crate in . wasmtime-*; do
     # Update the version number of this crate to $version.
     sed -i.bk -e "s/^version = .*/version = \"$version\"/" \
         "$crate/Cargo.toml"
@@ -36,7 +36,7 @@ cargo update
 echo git commit -a -m "\"Bump version to $version"\"
 echo git push
 for crate in \
-    environ
+    wasmtime-environ
 do
-    echo cargo publish --manifest-path "lib/$crate/Cargo.toml"
+    echo cargo publish --manifest-path "$crate/Cargo.toml"
 done
diff --git a/lib/debug/.gitignore → wasmtime-debug/.gitignore b/lib/debug/.gitignore → wasmtime-debug/.gitignore
diff --git a/lib/debug/Cargo.toml → wasmtime-debug/Cargo.toml b/lib/debug/Cargo.toml → wasmtime-debug/Cargo.toml
@@ -18,7 +18,7 @@ cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
 faerie = "0.7.0"
-wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
 target-lexicon = { version = "0.2.0", default-features = false }
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }

diff --git a/lib/debug/LICENSE → wasmtime-debug/LICENSE b/lib/debug/LICENSE → wasmtime-debug/LICENSE
diff --git a/lib/debug/README.md → wasmtime-debug/README.md b/lib/debug/README.md → wasmtime-debug/README.md
diff --git a/lib/debug/src/address_transform.rs → wasmtime-debug/src/address_transform.rs b/lib/debug/src/address_transform.rs → wasmtime-debug/src/address_transform.rs
diff --git a/lib/debug/src/lib.rs → wasmtime-debug/src/lib.rs b/lib/debug/src/lib.rs → wasmtime-debug/src/lib.rs
diff --git a/lib/debug/src/read_debuginfo.rs → wasmtime-debug/src/read_debuginfo.rs b/lib/debug/src/read_debuginfo.rs → wasmtime-debug/src/read_debuginfo.rs
diff --git a/lib/debug/src/transform.rs → wasmtime-debug/src/transform.rs b/lib/debug/src/transform.rs → wasmtime-debug/src/transform.rs
diff --git a/lib/debug/src/write_debuginfo.rs → wasmtime-debug/src/write_debuginfo.rs b/lib/debug/src/write_debuginfo.rs → wasmtime-debug/src/write_debuginfo.rs
diff --git a/lib/environ/.gitignore → wasmtime-environ/.gitignore b/lib/environ/.gitignore → wasmtime-environ/.gitignore
diff --git a/lib/environ/Cargo.toml → wasmtime-environ/Cargo.toml b/lib/environ/Cargo.toml → wasmtime-environ/Cargo.toml
diff --git a/lib/environ/LICENSE → wasmtime-environ/LICENSE b/lib/environ/LICENSE → wasmtime-environ/LICENSE
diff --git a/lib/environ/README.md → wasmtime-environ/README.md b/lib/environ/README.md → wasmtime-environ/README.md
diff --git a/lib/environ/src/compilation.rs → wasmtime-environ/src/compilation.rs b/lib/environ/src/compilation.rs → wasmtime-environ/src/compilation.rs
diff --git a/lib/environ/src/cranelift.rs → wasmtime-environ/src/cranelift.rs b/lib/environ/src/cranelift.rs → wasmtime-environ/src/cranelift.rs
diff --git a/lib/environ/src/func_environ.rs → wasmtime-environ/src/func_environ.rs b/lib/environ/src/func_environ.rs → wasmtime-environ/src/func_environ.rs
diff --git a/lib/environ/src/lib.rs → wasmtime-environ/src/lib.rs b/lib/environ/src/lib.rs → wasmtime-environ/src/lib.rs
diff --git a/lib/environ/src/module.rs → wasmtime-environ/src/module.rs b/lib/environ/src/module.rs → wasmtime-environ/src/module.rs
diff --git a/lib/environ/src/module_environ.rs → wasmtime-environ/src/module_environ.rs b/lib/environ/src/module_environ.rs → wasmtime-environ/src/module_environ.rs
diff --git a/lib/environ/src/tunables.rs → wasmtime-environ/src/tunables.rs b/lib/environ/src/tunables.rs → wasmtime-environ/src/tunables.rs
diff --git a/lib/environ/src/vmoffsets.rs → wasmtime-environ/src/vmoffsets.rs b/lib/environ/src/vmoffsets.rs → wasmtime-environ/src/vmoffsets.rs
diff --git a/lib/jit/Cargo.toml → wasmtime-jit/Cargo.toml b/lib/jit/Cargo.toml → wasmtime-jit/Cargo.toml
@@ -16,9 +16,9 @@ cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-frontend = "0.29.0"
-wasmtime-environ = { path = "../environ", default-features = false }
-wasmtime-runtime = { path = "../runtime", default-features = false }
-wasmtime-debug = { path = "../debug", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
+wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false }
+wasmtime-debug = { path = "../wasmtime-debug", default-features = false }
 region = "2.0.0"
 failure = { version = "0.1.3", default-features = false }
 failure_derive = { version = "0.1.3", default-features = false }

diff --git a/lib/jit/LICENSE → wasmtime-jit/LICENSE b/lib/jit/LICENSE → wasmtime-jit/LICENSE
diff --git a/lib/jit/README.md → wasmtime-jit/README.md b/lib/jit/README.md → wasmtime-jit/README.md
diff --git a/lib/jit/src/action.rs → wasmtime-jit/src/action.rs b/lib/jit/src/action.rs → wasmtime-jit/src/action.rs
diff --git a/lib/jit/src/code_memory.rs → wasmtime-jit/src/code_memory.rs b/lib/jit/src/code_memory.rs → wasmtime-jit/src/code_memory.rs
diff --git a/lib/jit/src/compiler.rs → wasmtime-jit/src/compiler.rs b/lib/jit/src/compiler.rs → wasmtime-jit/src/compiler.rs
diff --git a/lib/jit/src/context.rs → wasmtime-jit/src/context.rs b/lib/jit/src/context.rs → wasmtime-jit/src/context.rs
diff --git a/lib/jit/src/instantiate.rs → wasmtime-jit/src/instantiate.rs b/lib/jit/src/instantiate.rs → wasmtime-jit/src/instantiate.rs
diff --git a/lib/jit/src/lib.rs → wasmtime-jit/src/lib.rs b/lib/jit/src/lib.rs → wasmtime-jit/src/lib.rs
diff --git a/lib/jit/src/link.rs → wasmtime-jit/src/link.rs b/lib/jit/src/link.rs → wasmtime-jit/src/link.rs
diff --git a/lib/jit/src/namespace.rs → wasmtime-jit/src/namespace.rs b/lib/jit/src/namespace.rs → wasmtime-jit/src/namespace.rs
diff --git a/lib/jit/src/resolver.rs → wasmtime-jit/src/resolver.rs b/lib/jit/src/resolver.rs → wasmtime-jit/src/resolver.rs
diff --git a/lib/jit/src/target_tunables.rs → wasmtime-jit/src/target_tunables.rs b/lib/jit/src/target_tunables.rs → wasmtime-jit/src/target_tunables.rs
diff --git a/lib/obj/.gitignore → wasmtime-obj/.gitignore b/lib/obj/.gitignore → wasmtime-obj/.gitignore
diff --git a/lib/obj/Cargo.toml → wasmtime-obj/Cargo.toml b/lib/obj/Cargo.toml → wasmtime-obj/Cargo.toml
@@ -15,5 +15,5 @@ edition = "2018"
 cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
-wasmtime-environ = { path = "../environ" }
+wasmtime-environ = { path = "../wasmtime-environ" }
 faerie = "0.7.1"
diff --git a/lib/obj/LICENSE → wasmtime-obj/LICENSE b/lib/obj/LICENSE → wasmtime-obj/LICENSE
diff --git a/lib/obj/README.md → wasmtime-obj/README.md b/lib/obj/README.md → wasmtime-obj/README.md
diff --git a/lib/obj/src/context.rs → wasmtime-obj/src/context.rs b/lib/obj/src/context.rs → wasmtime-obj/src/context.rs
diff --git a/lib/obj/src/data_segment.rs → wasmtime-obj/src/data_segment.rs b/lib/obj/src/data_segment.rs → wasmtime-obj/src/data_segment.rs
diff --git a/lib/obj/src/function.rs → wasmtime-obj/src/function.rs b/lib/obj/src/function.rs → wasmtime-obj/src/function.rs
diff --git a/lib/obj/src/lib.rs → wasmtime-obj/src/lib.rs b/lib/obj/src/lib.rs → wasmtime-obj/src/lib.rs
diff --git a/lib/obj/src/module.rs → wasmtime-obj/src/module.rs b/lib/obj/src/module.rs → wasmtime-obj/src/module.rs
diff --git a/lib/obj/src/table.rs → wasmtime-obj/src/table.rs b/lib/obj/src/table.rs → wasmtime-obj/src/table.rs
diff --git a/lib/runtime/Cargo.toml → wasmtime-runtime/Cargo.toml b/lib/runtime/Cargo.toml → wasmtime-runtime/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 cranelift-codegen = "0.29.0"
 cranelift-entity = "0.29.0"
 cranelift-wasm = "0.29.0"
-wasmtime-environ = { path = "../environ", default-features = false }
+wasmtime-environ = { path = "../wasmtime-environ", default-features = false }
 region = "2.0.0"
 lazy_static = "1.2.0"
 libc = { version = "0.2.44", default-features = false }

diff --git a/lib/runtime/LICENSE → wasmtime-runtime/LICENSE b/lib/runtime/LICENSE → wasmtime-runtime/LICENSE
diff --git a/lib/runtime/README.md → wasmtime-runtime/README.md b/lib/runtime/README.md → wasmtime-runtime/README.md
diff --git a/lib/runtime/build.rs → wasmtime-runtime/build.rs b/lib/runtime/build.rs → wasmtime-runtime/build.rs
diff --git a/lib/runtime/signalhandlers/CMakeLists.txt → ...ime-runtime/signalhandlers/CMakeLists.txt b/lib/runtime/signalhandlers/CMakeLists.txt → ...ime-runtime/signalhandlers/CMakeLists.txt
diff --git a/...runtime/signalhandlers/SignalHandlers.cpp → ...runtime/signalhandlers/SignalHandlers.cpp b/...runtime/signalhandlers/SignalHandlers.cpp → ...runtime/signalhandlers/SignalHandlers.cpp
diff --git a/...runtime/signalhandlers/SignalHandlers.hpp → ...runtime/signalhandlers/SignalHandlers.hpp b/...runtime/signalhandlers/SignalHandlers.hpp → ...runtime/signalhandlers/SignalHandlers.hpp
diff --git a/lib/runtime/src/export.rs → wasmtime-runtime/src/export.rs b/lib/runtime/src/export.rs → wasmtime-runtime/src/export.rs
diff --git a/lib/runtime/src/imports.rs → wasmtime-runtime/src/imports.rs b/lib/runtime/src/imports.rs → wasmtime-runtime/src/imports.rs
diff --git a/lib/runtime/src/instance.rs → wasmtime-runtime/src/instance.rs b/lib/runtime/src/instance.rs → wasmtime-runtime/src/instance.rs
diff --git a/lib/runtime/src/jit_int.rs → wasmtime-runtime/src/jit_int.rs b/lib/runtime/src/jit_int.rs → wasmtime-runtime/src/jit_int.rs
diff --git a/lib/runtime/src/lib.rs → wasmtime-runtime/src/lib.rs b/lib/runtime/src/lib.rs → wasmtime-runtime/src/lib.rs
diff --git a/lib/runtime/src/libcalls.rs → wasmtime-runtime/src/libcalls.rs b/lib/runtime/src/libcalls.rs → wasmtime-runtime/src/libcalls.rs
diff --git a/lib/runtime/src/memory.rs → wasmtime-runtime/src/memory.rs b/lib/runtime/src/memory.rs → wasmtime-runtime/src/memory.rs
diff --git a/lib/runtime/src/mmap.rs → wasmtime-runtime/src/mmap.rs b/lib/runtime/src/mmap.rs → wasmtime-runtime/src/mmap.rs
diff --git a/lib/runtime/src/sig_registry.rs → wasmtime-runtime/src/sig_registry.rs b/lib/runtime/src/sig_registry.rs → wasmtime-runtime/src/sig_registry.rs
diff --git a/lib/runtime/src/signalhandlers.rs → wasmtime-runtime/src/signalhandlers.rs b/lib/runtime/src/signalhandlers.rs → wasmtime-runtime/src/signalhandlers.rs
diff --git a/lib/runtime/src/table.rs → wasmtime-runtime/src/table.rs b/lib/runtime/src/table.rs → wasmtime-runtime/src/table.rs
diff --git a/lib/runtime/src/traphandlers.rs → wasmtime-runtime/src/traphandlers.rs b/lib/runtime/src/traphandlers.rs → wasmtime-runtime/src/traphandlers.rs
diff --git a/lib/runtime/src/vmcontext.rs → wasmtime-runtime/src/vmcontext.rs b/lib/runtime/src/vmcontext.rs → wasmtime-runtime/src/vmcontext.rs
diff --git a/lib/wast/Cargo.toml → wasmtime-wast/Cargo.toml b/lib/wast/Cargo.toml → wasmtime-wast/Cargo.toml
@@ -16,9 +16,9 @@ cranelift-codegen = "0.29.0"
 cranelift-native = "0.29.0"
 cranelift-wasm = "0.29.0"
 cranelift-entity = "0.29.0"
-wasmtime-jit = { path = "../jit" }
-wasmtime-runtime = { path = "../runtime" }
-wasmtime-environ = { path = "../environ" }
+wasmtime-jit = { path = "../wasmtime-jit" }
+wasmtime-runtime = { path = "../wasmtime-runtime" }
+wasmtime-environ = { path = "../wasmtime-environ" }
 wabt = "0.7"
 target-lexicon = "0.2.0"
 failure = { version = "0.1.3", default-features = false }

diff --git a/lib/wast/LICENSE → wasmtime-wast/LICENSE b/lib/wast/LICENSE → wasmtime-wast/LICENSE
diff --git a/lib/wast/README.md → wasmtime-wast/README.md b/lib/wast/README.md → wasmtime-wast/README.md
diff --git a/lib/wast/src/lib.rs → wasmtime-wast/src/lib.rs b/lib/wast/src/lib.rs → wasmtime-wast/src/lib.rs
diff --git a/lib/wast/src/spectest.rs → wasmtime-wast/src/spectest.rs b/lib/wast/src/spectest.rs → wasmtime-wast/src/spectest.rs
diff --git a/lib/wast/src/wast.rs → wasmtime-wast/src/wast.rs b/lib/wast/src/wast.rs → wasmtime-wast/src/wast.rs