Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

examples: New app to build Rust with Cargo #2487

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions examples/hello_rust_cargo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# ##############################################################################
# apps/examples/hello_rust_cargo/CMakeLists.txt
#
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
# license agreements. See the NOTICE file distributed with this work for
# additional information regarding copyright ownership. The ASF licenses this
# file to you under the Apache License, Version 2.0 (the "License"); you may not
# use this file except in compliance with the License. You may obtain a copy of
# the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations under
# the License.
#
# ##############################################################################

include(nuttx_add_library)

if(CONFIG_EXAMPLES_HELLO_RUST_CARGO)

# Call cargo build from CMakeLists and add it to the build system. Notice we
# should call cargo build with add_custom_target, otherwise cargo will be
# called every time when cmake is configured.

add_custom_command(
OUTPUT
${CMAKE_BINARY_DIR}/hello_rust_cargo/riscv32imac-unknown-nuttx-elf/release/libhello.a
COMMAND
cargo build --release -Zbuild-std=core --manifest-path
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we move to examples/hello_rust_cargo/hello/

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or better examples/rust/cargo/hello? :-)

${CMAKE_CURRENT_SOURCE_DIR}/hello/Cargo.toml --target
riscv32imac-unknown-nuttx-elf --target-dir
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we generalize the common to a function for all possible arch?

${CMAKE_BINARY_DIR}/hello_rust_cargo)

add_custom_target(
hello_rust_cargo
DEPENDS
${CMAKE_BINARY_DIR}/hello_rust_cargo/riscv32imac-unknown-nuttx-elf/release/libhello.a
)

# Call cargo_build target each time when cmake is configured or generated.

# Add static library to the build system.
nuttx_library_import(
rust_hello
${CMAKE_BINARY_DIR}/hello_rust_cargo/riscv32imac-unknown-nuttx-elf/release/libhello.a
)
nuttx_add_extra_library(rust_hello)

nuttx_add_application(
NAME
${CONFIG_EXAMPLES_HELLO_RUST_CARGO_PROGNAME}
SRCS
proxy_main.c
STACKSIZE
${CONFIG_EXAMPLES_HELLO_STACKSIZE}
PRIORITY
${CONFIG_EXAMPLES_HELLO_PRIORITY})

endif() # CONFIG_EXAMPLES_HELLO_RUST_CARGO
29 changes: 29 additions & 0 deletions examples/hello_rust_cargo/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#

config EXAMPLES_HELLO_RUST_CARGO
tristate "\"Hello, Rust!\" example with Cargo"
default n
---help---
Enable the \"Hello, Rust!\" example using Cargo to build.

if EXAMPLES_HELLO_RUST_CARGO

config EXAMPLES_HELLO_RUST_CARGO_PROGNAME
string "Program name"
default "hello_rust_cargo"
---help---
This is the name of the program that will be used when the
program is installed.

config EXAMPLES_HELLO_RUST_CARGO_PRIORITY
int "Hello Rust task priority"
default 100

config EXAMPLES_HELLO_RUST_CARGO_STACKSIZE
int "Hello Rust stack size"
default DEFAULT_TASK_STACKSIZE

endif
23 changes: 23 additions & 0 deletions examples/hello_rust_cargo/Make.defs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/examples/hello_rust_cargo/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################

ifneq ($(CONFIG_EXAMPLES_HELLO_RUST_CARGO),)
CONFIGURED_APPS += $(APPDIR)/examples/hello_rust_cargo
endif
32 changes: 32 additions & 0 deletions examples/hello_rust_cargo/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
############################################################################
# apps/examples/hello_rust/Makefile
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################

include $(APPDIR)/Make.defs

# Hello, Rust! built-in application info

PROGNAME = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_PROGNAME)
PRIORITY = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_PRIORITY)
STACKSIZE = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_HELLO_RUST_CARGO)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how to link libhello.a


# Do not suppport building this application from Makefile.

include $(APPDIR)/Application.mk
1 change: 1 addition & 0 deletions examples/hello_rust_cargo/hello/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
target
16 changes: 16 additions & 0 deletions examples/hello_rust_cargo/hello/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[package]
name = "hello"
version = "0.1.0"
edition = "2021"

[lib]
crate-type = ["staticlib"]

[profile.dev]
panic = "abort"

# Special hanlding for the panic! macro, can be removed once
# the libstd port for NuttX is complete.
[profile.release]
panic = "abort"
lto = true
7 changes: 7 additions & 0 deletions examples/hello_rust_cargo/hello/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

// Function hello_rust_cargo without manglng
#[no_mangle]
pub extern "C" fn rust_main() {
// Print hello world to stdout
println!("Hello, world! from Rust and Cargo!");
}
42 changes: 42 additions & 0 deletions examples/hello_rust_cargo/proxy_main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/****************************************************************************
* apps/examples/hello_rust_cargo/proxy_main.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/

/****************************************************************************
* Included Files
****************************************************************************/

#include <nuttx/config.h>
#include <stdio.h>

/****************************************************************************
* Public Functions
****************************************************************************/

extern void rust_main(void);

/****************************************************************************
* main
****************************************************************************/

int main(int argc, FAR char *argv[])
{
rust_main();
return 0;
}
Loading