922283ee5d
Merged in masayuki2009/nuttx.apps/loadable_app (pull request #148) loadable app support * apps: Introduce a build system for loadable apps for nsh. This PR consits of following changes. (NOTE: Changes to each application will be provided separately) apps/nshlib/Kconfig: Add 'option modules' to NSH_FILE_APPS so that a user can change an application configuration to tristate (y/n/m) apps/Make.defs: Override COMPILE and COMPILEXX macros to compile loadable apps. To make loadable apps, -DLOADABLE_APP is added to the flags. Also, introduce ELFLD to link a lodable app. Please note that the variable 'LOADABLE' must be defined in each application Makefile if you want to make a loadable app. apps/Application.mk: Add .build target in case of 'LOADABLE=y' which is used to link a final loadable application and install the app to apps/bin. apps/Makefile: Add SYMTABSRC and SYMTABOBJ variables for loadable apps which will be generated under the apps directory. Add make_symbols target which will be called when all applications are installed to generate symtab_app.c which is used for nsh to inform symbol information to the NuttX kernel. Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com> * apps/examples/hello: Apply changes to support a lodable app. Kconfig: Change the application state from bool to tristate Make.defs: Change the condition to build. By default, the application is not selected (i.e. 'n'), so if other states (i.e. y/m) are selected, the application will be compiled. Makefile: If the application is specified to 'm', the variable 'LOADABLE' must be defined here. Also note that other variables (PRIORITY and STACKSIZE) can only be used for built-in apps. hello_main.c Add LOADABLE_APP condition to main(). Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com> * apps/examples/helloxx: Apply changes to support a lodable app. Kconfig: Change the application state from bool to tristate Make.defs: Change the condition to build. By default, the application is not selected (i.e. 'n'), so if other states (i.e. y/m) are selected, the application will be compiled. Makefile: If the application is specified to 'm', the variable 'LOADABLE' must be defined here. Also note that other variables (PRIORITY and STACKSIZE) can only be used for built-in apps. helloxx_main.c Add LOADABLE_APP condition to main(). Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com> Approved-by: GregoryN <gnutt@nuttx.org>
141 lines
4.4 KiB
Plaintext
141 lines
4.4 KiB
Plaintext
############################################################################
|
|
# apps/Make.defs
|
|
# Common make definitions provided to all applications
|
|
#
|
|
# Copyright (C) 2011, 2014, 2016, 2018 Gregory Nutt. All rights reserved.
|
|
# Author: Gregory Nutt <gnutt@nuttx.org>
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
#
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in
|
|
# the documentation and/or other materials provided with the
|
|
# distribution.
|
|
# 3. Neither the name NuttX nor the names of its contributors may be
|
|
# used to endorse or promote products derived from this software
|
|
# without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
############################################################################
|
|
|
|
# Builtin Registration
|
|
|
|
BUILTIN_REGISTRY = $(APPDIR)$(DELIM)builtin$(DELIM)registry
|
|
|
|
DEPCONFIG = $(TOPDIR)$(DELIM).config
|
|
|
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
|
define REGISTER
|
|
$(Q) echo Register: $1
|
|
$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
|
|
$(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
|
|
$(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated"
|
|
endef
|
|
else
|
|
define REGISTER
|
|
$(Q) echo "Register: $1"
|
|
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
|
|
$(Q) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
|
|
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
|
|
endef
|
|
endif
|
|
|
|
# COMPILE - a macro to compile a loadable app in C
|
|
|
|
ifeq ($(LOADABLE),y)
|
|
define COMPILE
|
|
@echo "CC) $1"
|
|
$(Q) $(CC) -c $(CELFFLAGS) -DLOADABLE_APP $1 -o $2
|
|
endef
|
|
endif
|
|
|
|
# COMPILEXX - a macro to compile a loadable app in C++
|
|
|
|
ifeq ($(LOADABLE),y)
|
|
define COMPILEXX
|
|
@echo "CXX: $1"
|
|
$(Q) $(CXX) -c $(CXXELFFLAGS) -DLOADABLE_APP $1 -o $2
|
|
endef
|
|
endif
|
|
|
|
# ELFLD - a macro to link loadable app
|
|
# Example: $(call ELFLD, entry point, in-file(s), out-file)
|
|
|
|
define ELFLD
|
|
@echo "LD: $3"
|
|
$(Q) $(LD) $(LDELFFLAGS) $2 -o $3
|
|
$(Q) chmod +x $3
|
|
endef
|
|
|
|
# Tools
|
|
#
|
|
# In a normal build, tools will reside in the nuttx/tools sub-directory and
|
|
# TOPDIR will refer to that nuttx/ directory. This, however, is not the
|
|
# case when building apps/ with a NuttX export directory; there is no
|
|
# apps/import/tools directory. In that case copies of the NuttX tools in
|
|
# the apps/tools directory are used.
|
|
|
|
DELIM ?= $(strip /)
|
|
ifneq (,$(wildcard $(TOPDIR)$(DELIM)tools))
|
|
TOOLDIR = $(TOPDIR)$(DELIM)tools
|
|
else
|
|
TOOLDIR = $(APPDIR)$(DELIM)tools
|
|
endif
|
|
|
|
ifeq ($(DIRLINK),)
|
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
|
DIRLINK = $(TOOLDIR)$(DELIM)link.bat
|
|
DIRUNLINK = $(TOOLDIR)$(DELIM)unlink.bat
|
|
else ifeq ($(CONFIG_WINDOWS_MSYS),y)
|
|
DIRLINK = $(TOOLDIR)$(DELIM)copydir.sh
|
|
DIRUNLINK = $(TOOLDIR)$(DELIM)unlink.sh
|
|
else
|
|
DIRUNLINK = $(TOOLDIR)$(DELIM)unlink.sh
|
|
ifeq ($(WINTOOL),y)
|
|
DIRLINK = $(TOOLDIR)$(DELIM)copydir.sh
|
|
else
|
|
DIRLINK = $(TOOLDIR)$(DELIM)link.sh
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
|
MKKCONFIG = $(APPDIR)$(DELIM)tools$(DELIM)mkkconfig.bat
|
|
else
|
|
MKKCONFIG = $(APPDIR)$(DELIM)tools$(DELIM)mkkconfig.sh
|
|
endif
|
|
|
|
ifeq ($(INCDIR),)
|
|
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
|
INCDIR = $(TOOLDIR)$(DELIM)incdir.bat
|
|
else
|
|
INCDIR = $(TOOLDIR)$(DELIM)incdir.sh
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(WINTOOL),y)
|
|
INCDIROPT = -w
|
|
endif
|
|
|
|
# Standard include path
|
|
|
|
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
|
|
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
|
|
|