Commit Graph

50 Commits

Author SHA1 Message Date
Xiang Xiao
deaa6c5b7b build: Replace $(TOPDIR)/Make.defs with $(APPDIR)/Make.defs
and move NUTTXLIB defintion to the common place

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-07-09 15:17:37 -03:00
liuhaitao
40c325adfe build: Remove some duplicated definitions
Unified the duplicated definitions into nuttx/tools/Config.mk.

Signed-off-by: liuhaitao <liuhaitao@xiaomi.com>
2020-05-22 14:18:17 +01:00
Xiang Xiao
ead498a788 build: Remove the workaround for the inexistence of .config/Make.defs
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-05-21 17:43:42 +01:00
Xiang Xiao
36bce2959a build: Remove the duplicated definition
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-05-19 14:53:21 -06:00
Xiang Xiao
6a26547dec build: Move INCDIROPT to common place
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-05-18 15:37:24 -06:00
Xiang Xiao
d232823e63 build: Replace WINTOOL with CYGWIN_WINTOOL Kconfig
so the correct value can be determinated by Kconfig system automatically

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2020-05-18 15:37:24 -06:00
Xiang Xiao
0a6f978771 app/builtin: simplify the application registraion flow
Change-Id: I6b92385e72d0e1a30123f12dbb9c4fd3e90b0315
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Signed-off-by: chao.an <anchao@xiaomi.com>
2020-05-18 09:51:09 -06:00
Xiang Xiao
6ddf347178
Move MAKE_template and SDIR_template to Make.defs (#135)
So Directory.mk and Makefile can share the same definition
2020-03-22 10:06:37 -06:00
YAMAMOTO Takashi
38f006464b Put back libapps to the default LDLIBS, even for KERNEL build
This is a partial revert of b5cfd93444
("apps/: Modification to build system: Unified application compilation rules")
2020-02-26 01:04:52 -06:00
YAMAMOTO Takashi
9d59f5e524 Revert "Remove libapps.a from LDLIBS"
It was necessary for PROTECTED build.

This reverts commit 4ee39e2080.
2020-02-26 01:04:52 -06:00
Xiang Xiao
f774e8ee72 build: Use flock to serialize ar steps as workaround
Use flock to serialize ar steps to avoid parallel build break
sometimes.
2020-02-22 07:43:06 -06:00
YAMAMOTO Takashi
4ee39e2080 Remove libapps.a from LDLIBS
I don't understand how it's supposed to work.
(As libapps.a is likely not fully baked at that point.)

I don't understand why it's necessary either.
2020-02-21 07:37:51 -06:00
YAMAMOTO Takashi
698f0edbaa Revert "build: Use flock to serialize ar steps as workaround"
This reverts commit 6707bfae86.
2020-02-21 07:37:51 -06:00
Xiang Xiao
6707bfae86 build: Use flock to serialize ar steps as workaround
Use flock to serialize ar steps to avoid parallel build break
sometimes.
2020-02-20 13:14:53 -06:00
Gregory Nutt
57f99a6fb7 Make.defs: When building MODULES under Cygwin, the path to libapps.a that is passed to the Windows linker must first be converted with cygpath. 2019-12-04 11:01:43 -06:00
Xiang Xiao
b4482370cf Make.defs: Fix nuttxtoolsunlink.sh: Command not found. 2019-11-11 09:04:10 -06:00
Xiang Xiao
75cd1dfd74 apps/: Move the common variable definitions from other build-related files into apps/Make.defs. 2019-10-17 11:40:39 -06:00
Xiang Xiao
4b49362719 apps/Makefile: Make libapps overwritable. 2019-10-03 14:07:17 -06:00
Xiang Xiao
5d6681dc9f Remove the duplicated build script files from apps/impor/tools. These will now be copied from nuttx/tools when the export package is created. 2019-10-01 07:51:01 -06:00
anchao
b5cfd93444 apps/: Modification to build system: Unified application compilation rules 2018-09-03 09:29:56 -06:00
anchao
220653f21c 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.
2018-08-23 11:06:15 -06:00
Gregory Nutt
23066a71f0 Grr.. last commit unreverted some changes. I think it is right now. 2018-08-22 12:19:36 -06:00
Gregory Nutt
0bdb179160 Move a copy of define.bat and sh from nuttx/tools to apps/tools so that they will be availalbe for the import build. 2018-08-22 12:08:31 -06:00
Gregory Nutt
2f982e9c77 Revert "Squashed commit of the following:"
This reverts commit 25b92edd9f.
2018-08-22 12:06:32 -06:00
anchao
25b92edd9f Squashed commit of the following:
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.
2018-08-22 09:30:38 -06:00
Gregory Nutt
922283ee5d Squashed commit of the following:
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>
2018-08-03 12:05:01 -06:00
Gregory Nutt
cb9e9510d9 apps/Make.defs: Improve the symtab target. tools/mksymtab.sh: Fix a typo. 2018-07-17 11:42:23 -06:00
Gregory Nutt
272bdc0d6e apps Makesystem: Fix an error when building apps/ withtout nuttx/, using only the NuttX export package only and assuming that the nuttx/ directory in not even present. In this case, the problem fixed where the apps/Make.defs file was selecting tools from the /tools directory which does not exist because TOPDIR=apps/import. Instead, for this build case, I have not thought of any option but to duplicate scripts as necessary in the apps/tools directory. Also added a top-level target to compile the symbol table. Misc fixes: quoting in scripts, some errors in script syntax. 2018-07-17 10:42:15 -06:00
Gregory Nutt
e4a30d55ee apps/Make.defs: Simplify last fix 2018-06-11 13:22:52 -06:00
Gregory Nutt
bf232771f6 apps/Make.defs: Fix an error introduced with recent chagne. MKKCONFIG may not be defined resulting in failure to create apps/Kconfig. 2018-06-11 10:21:22 -06:00
Gregory Nutt
0509c48ca3 Various fixes necessary to build the simulator under MSYS. 2018-05-31 13:26:18 -06:00
Gregory Nutt
d2800049a3 Make.defs: Using wrong link script if native window tool used with Cygwin 2016-11-17 07:22:32 -06:00
Gregory Nutt
11012a6c3e Add DIRLINK and DIRUNLOBK tool definitions to Make.defs 2016-08-02 08:38:20 -06:00
Gregory Nutt
11ef5ac1b3 (1) Make.defs set the include path in CFLAGS, but not in CXXFLAGS, (2) canutils/libuavcan/Makefile should not use explication / delimiters. It should not use -I. I should use DELIM: command not found and nuttx/tools/incdir.sh 2016-07-21 11:35:13 -06:00
Gregory Nutt
3e83aa7388 Add apps/include to include path in top-level Make.defs file. Remove multiple definitions of INCDIR opt. 2016-07-11 10:45:17 -06:00
Sebastien Lorquet
a9aa753fa4 Recursive Kconfig autogeneration 2016-06-02 16:34:00 +02:00
Gregory Nutt
b19e1aa426 Removed all support for the legacy configuration mechanism from the apps/ directory 2014-03-06 12:21:14 -06:00
Gregory Nutt
c4c49ffbb3 More changes for a correct NSH Windows natvie build 2014-02-07 10:56:24 -06:00
patacongo
e2bf277b80 Add logic to serialize and marshal out-of-band keyboard commands
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5460 42af7a65-404d-4744-a932-0658087f49c3
2012-12-25 17:22:58 +00:00
patacongo
3e98f528a4 Some fixes to apps/builtin/registry need to handle some additional cases
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5456 42af7a65-404d-4744-a932-0658087f49c3
2012-12-24 13:15:57 +00:00
patacongo
b104cce86b Remove .context kludge from apps/ directory
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5455 42af7a65-404d-4744-a932-0658087f49c3
2012-12-23 22:17:09 +00:00
patacongo
88d3058222 Rename namedapp as simply builtin
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5454 42af7a65-404d-4744-a932-0658087f49c3
2012-12-23 20:22:41 +00:00
patacongo
f8e08440f7 Email address change in apps/
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5143 42af7a65-404d-4744-a932-0658087f49c3
2012-09-13 16:58:49 +00:00
patacongo
3766aebbb4 Developing a new way to handle application configurations
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4609 42af7a65-404d-4744-a932-0658087f49c3
2012-04-14 20:01:08 +00:00
patacongo
e6135f14e0 Changes for clean ez80 ZDS-II compile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3733 42af7a65-404d-4744-a932-0658087f49c3
2011-06-22 15:22:56 +00:00
patacongo
9fc214c5a7 Renamed nuttapp to namedapp; add binfs to nammedapp/
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3429 42af7a65-404d-4744-a932-0658087f49c3
2011-03-28 13:01:57 +00:00
patacongo
a30185e702 More build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3407 42af7a65-404d-4744-a932-0658087f49c3
2011-03-20 22:07:56 +00:00
patacongo
f85c55a252 Move VSN apps to apps/vsn
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3397 42af7a65-404d-4744-a932-0658087f49c3
2011-03-19 15:02:01 +00:00
patacongo
abd406383f apps/ make changes + SLIP MTU notes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3381 42af7a65-404d-4744-a932-0658087f49c3
2011-03-14 23:24:42 +00:00
patacongo
5a0ff44cc3 Add apps/poweroff lpc17 hardware handshake
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3380 42af7a65-404d-4744-a932-0658087f49c3
2011-03-14 20:50:46 +00:00