mirror of
https://github.com/apache/nuttx-apps.git
synced 2025-10-19 19:44:35 +08:00
Squashed commit of the following:
Author: anchao <anchao@pinecone.net> apps/, most main() function: Correct CONFIG_BUILD_LOADABLE usage Loadable apps/: Correct loadable symbol table generate apps/system/ubloxmodem: Fix build break apps/examples/ostest: start restart/waitpid/user test from main loop apps/nshlib: Expand reboot and poweroff commands to include a second, optional mode argument Author: Gregory Nutt <gnutt@nuttx.org> An attempt to fix build issues. Does not work. apps/examples/ostest: Fix some inappropriate renaming of static functions introduced with recent patches. apps/builtin/exec_builtin.c: Fix a error introduced by recent comments. Found in build testing. Author: anchao <anchao@pinecone.net> apps/builtin/exec_builtin.c: Try posix_spawn if builtin apps do not have have an entry point. apps/Application.mk: introduce MODULE config to simplify tristate(m) apps/nsh: Change the nuttx shell module type to tristate apps: Add loadable application support script/mksymtab: Generate symbol table name by default apps/builtin: Allow loadable applications can register with apps/builtin.
This commit is contained in:
@@ -107,7 +107,7 @@
|
||||
|
||||
#undef HAVE_NSH_COMMAND
|
||||
#if (defined(CONFIG_SYSTEM_SYSTEM) || defined(CONFIG_SYSTEM_POPEN)) && \
|
||||
defined(CONFIG_BUILD_KERNEL)
|
||||
defined(CONFIG_BUILD_LOADABLE)
|
||||
# define HAVE_NSH_COMMAND 1
|
||||
#endif
|
||||
|
||||
@@ -264,7 +264,7 @@ static int nsh_task(void)
|
||||
* Name: nsh_main
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_BUILD_KERNEL
|
||||
#ifdef BUILD_MODULE
|
||||
int main(int argc, FAR char *argv[])
|
||||
#else
|
||||
int nsh_main(int argc, char *argv[])
|
||||
@@ -277,7 +277,7 @@ int nsh_main(int argc, char *argv[])
|
||||
* 2) As a single command processor. In this case, the single command is
|
||||
* is provided in argv[1].
|
||||
*
|
||||
* NOTE: The latter mode is only available if CONFIG_BUILD_KERNEL=y. In
|
||||
* NOTE: The latter mode is only available if CONFIG_BUILD_LOADABLE=y. In
|
||||
* that cause, this main() function will be build as a process. The process
|
||||
* will be started with a command by the implementations of the system() and
|
||||
* popen() interfaces.
|
||||
|
Reference in New Issue
Block a user