Skip to content

Commit

Permalink
examples: Split hello example into hello and hello_wasm
Browse files Browse the repository at this point in the history
Decouple the hello example into hello and hello_wasm. The hello_wasm
example is a minimal example to show how to build a wasm application
by using the NuttX build system, and avoid disturbing the hello
(native build).

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
  • Loading branch information
no1wudi committed Oct 8, 2023
1 parent 3177a9b commit d715b83
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 8 deletions.
8 changes: 0 additions & 8 deletions examples/hello/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,4 @@ MODULE = $(CONFIG_EXAMPLES_HELLO)

MAINSRC = hello_main.c

# Build with WebAssembly when CONFIG_INTERPRETERS_WAMR is enabled

WASM_BUILD = both

# Mode of WebAssembly Micro Runtime

WAMR_MODE = AOT

include $(APPDIR)/Application.mk
29 changes: 29 additions & 0 deletions examples/hello_wasm/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_WASM
tristate "\"Hello, WebAssembly!\" example"
default n
---help---
Enable the \"Hello, WebAssembly!\" example

if EXAMPLES_HELLO_WASM

config EXAMPLES_HELLO_WASM_PROGNAME
string "Program name"
default "hello_wasm"
---help---
This is the name of the program that will be used when the NSH ELF
program is installed.

config EXAMPLES_HELLO_WASM__PRIORITY
int "Hello wasm task priority"
default 100

config EXAMPLES_HELLO_WASM_STACKSIZE
int "Hello wasm stack size"
default DEFAULT_TASK_STACKSIZE

endif
23 changes: 23 additions & 0 deletions examples/hello_wasm/Make.defs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
############################################################################
# apps/examples/hello_wasm/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_WASM),)
CONFIGURED_APPS += $(APPDIR)/examples/hello_wasm
endif
42 changes: 42 additions & 0 deletions examples/hello_wasm/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
############################################################################
# apps/examples/hello_wasm/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, World! built-in application info

PROGNAME = $(CONFIG_EXAMPLES_HELLO_WASM_PROGNAME)
PRIORITY = $(CONFIG_EXAMPLES_HELLO_WASM_PRIORITY)
STACKSIZE = $(CONFIG_EXAMPLES_HELLO_WASM_STACKSIZE)
MODULE = $(CONFIG_EXAMPLES_HELLO_WASM)

# Hello, World! Example

MAINSRC = hello_main.c

# Build with WebAssembly when CONFIG_INTERPRETERS_WAMR is enabled

WASM_BUILD = y

# Mode of WebAssembly Micro Runtime

WAMR_MODE = AOT

include $(APPDIR)/Application.mk
40 changes: 40 additions & 0 deletions examples/hello_wasm/hello_main.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/****************************************************************************
* apps/examples/hello_wasm/hello_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
****************************************************************************/

/****************************************************************************
* hello_main
****************************************************************************/

int main(int argc, FAR char *argv[])
{
printf("Hello, WebAssembly!!\n");
return 0;
}

0 comments on commit d715b83

Please sign in to comment.