This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/599-rust-hello-world-bundle in repository https://gitbox.apache.org/repos/asf/celix.git
commit a131c9c32f36170112e4861716567ed389a95b2b Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Jul 30 22:39:51 2023 +0200 Move rust dir to misc/experimental and Cargo.lock to gitignore --- misc/experimental/CMakeLists.txt | 3 ++- misc/experimental/bundles/CMakeLists.txt | 1 - misc/experimental/{bundles/rust/Cargo.toml => rust/.gitignore} | 8 +------- misc/experimental/{bundles => }/rust/CMakeLists.txt | 2 +- misc/experimental/{bundles => }/rust/README.md | 0 .../{bundles/rust => rust/hello_world_activator}/Cargo.toml | 0 .../{bundles/rust => rust/hello_world_activator}/src/lib.rs | 0 7 files changed, 4 insertions(+), 10 deletions(-) diff --git a/misc/experimental/CMakeLists.txt b/misc/experimental/CMakeLists.txt index de3b7a7c..f4de02bf 100644 --- a/misc/experimental/CMakeLists.txt +++ b/misc/experimental/CMakeLists.txt @@ -18,4 +18,5 @@ celix_subproject(EXPERIMENTAL "Options to enable building the experimental - non stable - bundles/libraries. " OFF) if (EXPERIMENTAL) add_subdirectory(bundles) -endif () \ No newline at end of file + add_subdirectory(rust) +endif () diff --git a/misc/experimental/bundles/CMakeLists.txt b/misc/experimental/bundles/CMakeLists.txt index 10d871ac..b96038d7 100644 --- a/misc/experimental/bundles/CMakeLists.txt +++ b/misc/experimental/bundles/CMakeLists.txt @@ -20,5 +20,4 @@ if (NOT APPLE) add_subdirectory(config_admin) add_subdirectory(event_admin) add_subdirectory(pubsub_admin_nanomsg) - add_subdirectory(rust) endif () diff --git a/misc/experimental/bundles/rust/Cargo.toml b/misc/experimental/rust/.gitignore similarity index 86% copy from misc/experimental/bundles/rust/Cargo.toml copy to misc/experimental/rust/.gitignore index bcfb71a8..71debfb5 100644 --- a/misc/experimental/bundles/rust/Cargo.toml +++ b/misc/experimental/rust/.gitignore @@ -15,10 +15,4 @@ # specific language governing permissions and limitations # under the License. -[package] -name = "rust_bundle_example" -version = "0.1.0" - -[lib] -name = "rust_bundle_activator" -crate-type = ["cdylib"] +Cargo.lock \ No newline at end of file diff --git a/misc/experimental/bundles/rust/CMakeLists.txt b/misc/experimental/rust/CMakeLists.txt similarity index 95% rename from misc/experimental/bundles/rust/CMakeLists.txt rename to misc/experimental/rust/CMakeLists.txt index 68812a86..cedd5303 100644 --- a/misc/experimental/bundles/rust/CMakeLists.txt +++ b/misc/experimental/rust/CMakeLists.txt @@ -25,7 +25,7 @@ if (CELIX_RUST_EXPERIMENTAL) ) FetchContent_MakeAvailable(Corrosion) - corrosion_import_crate(MANIFEST_PATH Cargo.toml) + corrosion_import_crate(MANIFEST_PATH hello_world_activator/Cargo.toml) #Note corrosion_import_crate import creates a rust_bundle_activator CMake target, but this is a INTERFACE target. #For no using abs path to expected bundle activator lib as ACTIVATOR argument diff --git a/misc/experimental/bundles/rust/README.md b/misc/experimental/rust/README.md similarity index 100% rename from misc/experimental/bundles/rust/README.md rename to misc/experimental/rust/README.md diff --git a/misc/experimental/bundles/rust/Cargo.toml b/misc/experimental/rust/hello_world_activator/Cargo.toml similarity index 100% rename from misc/experimental/bundles/rust/Cargo.toml rename to misc/experimental/rust/hello_world_activator/Cargo.toml diff --git a/misc/experimental/bundles/rust/src/lib.rs b/misc/experimental/rust/hello_world_activator/src/lib.rs similarity index 100% rename from misc/experimental/bundles/rust/src/lib.rs rename to misc/experimental/rust/hello_world_activator/src/lib.rs
