sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged nuttx/apps into master

Browse Source
This commit is contained in:
Pierre-noel Bouteville 2016-06-11 12:52:35 +02:00
commit 6486bb0ff7
203 changed files with 2386 additions and 775 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Application.mk
View File

@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path .
VPATH = VPATH =
all: .built all: .built
.PHONY: clean depend distclean .PHONY: clean preconfig depend distclean
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -103,6 +103,8 @@ else
install: install:
endif endif
preconfig:
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
ifneq ($(APPNAME),) ifneq ($(APPNAME),)
ifneq ($(PRIORITY),) ifneq ($(PRIORITY),)

16
ChangeLog.txt
View File

@ -1607,6 +1607,8 @@
7.17 2016-xx-xx Gregory Nutt <gnutt@nuttx.org> 7.17 2016-xx-xx Gregory Nutt <gnutt@nuttx.org>
* apps/examples/alarm: ioctl call was clobbering file descriptor
(2016-06-02).
* apps/system/flash_eraseall: Removed! This logic violates the OS/ * apps/system/flash_eraseall: Removed! This logic violates the OS/
application interface and cannot be supported. The old code can still application interface and cannot be supported. The old code can still
be found in the 'Obsoleted' repository (2016-06-03). be found in the 'Obsoleted' repository (2016-06-03).
@ -1614,4 +1616,16 @@
(2016-06-04). (2016-06-04).
* apps/system/flash_eraseall: Restored! Using the new IOCTL wrapper at * apps/system/flash_eraseall: Restored! Using the new IOCTL wrapper at
apps/fsutils/flash_eraseall (2016-06-04). apps/fsutils/flash_eraseall (2016-06-04).
* apps/canutils/libuavcan: Fix for recent change to STM32 timer frequency
definiitions (2016-06-05).
* Many files: Change to the way that Kconfig files are generated in order
to better support reuse of the apps/ directory in NuttX products. Changes
include: Make the full tree use wildcards make.defs, Add empty preconfig
rules to 'leaf' makefiles, Use directory.mk for recursive dir makefiles,
Individual app kconfig fixes, Recursive Kconfig autogeneration, Add
kconfig files for pcode and tiff, and fix a gitignore rule, From
Sébastien Lorquet (2016-06-06).
* apps/nshlib: Make NSH net-initialization be a configuration option. From
Marten Svanfeld (2016-06-09).
* netutils/ntpc and nshlib: NTP Client: All retries; Add initialization
in NSH network startup logic. From David S. Alessio (2016-06-09) .

5
Directory.mk
View File

@ -34,6 +34,7 @@
############################################################################ ############################################################################
-include $(TOPDIR)/.config # Current configuration -include $(TOPDIR)/.config # Current configuration
include $(APPDIR)/Make.defs
# Sub-directories # Sub-directories
@ -48,6 +49,7 @@ $(1)_$(2):
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef endef
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),preconfig)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean))) $(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
@ -57,6 +59,9 @@ nothing:
install: install:
preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig)
$(Q) $(MKKCONFIG) -m $(MENUDESC)
context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context) context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context)
depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend) depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)

8
Make.defs
View File

@ -53,3 +53,11 @@ define REGISTER
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated" $(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
endef endef
endif endif
# Tools
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat
else
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
endif

20
Makefile
View File

@ -39,14 +39,7 @@ APPDIR = ${shell pwd}
TOPDIR ?= $(APPDIR)/import TOPDIR ?= $(APPDIR)/import
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
-include $(APPDIR)/Make.defs
# Tools
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
MKKCONFIG = ${shell $(APPDIR)\tools\mkkconfig.bat}
else
MKKCONFIG = ${shell $(APPDIR)/tools/mkkconfig.sh}
endif
# Application Directories # Application Directories
@ -85,9 +78,15 @@ BIN = libapps$(LIBEXT)
all: $(BIN) all: $(BIN)
.PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean .PHONY: import install context context_serialize context_rest .depdirs preconfig depend clean distclean
define MAKE_template
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
endef
define SDIR_template define SDIR_template
$(1)_$(2): $(1)_$(2):
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)" $(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" BIN_DIR="$(BIN_DIR)"
endef endef
$(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all))) $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),all)))
@ -119,8 +118,9 @@ context_serialize:
context: context_serialize context: context_serialize
Kconfig: $(MKKCONFIG) Kconfig:
$(MKKCONFIG) $(foreach SDIR, $(BUILDIRS), $(call MAKE_template,$(SDIR),preconfig))
$(Q) $(MKKCONFIG)
preconfig: Kconfig preconfig: Kconfig

2
builtin/Makefile
View File

@ -136,3 +136,5 @@ distclean: clean
$(call DELFILE, builtin_proto.h) $(call DELFILE, builtin_proto.h)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
canutils/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/Kconfig

11
canutils/Kconfig
View File

@ -1,11 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "CAN Utilities"
source "$APPSDIR/canutils/libcanard/Kconfig"
source "$APPSDIR/canutils/libuavcan/Kconfig"
endmenu # CAN Utilities

2
canutils/Makefile
View File

@ -33,4 +33,6 @@
# #
############################################################################ ############################################################################
MENUDESC = "CAN Utilities"
include $(APPDIR)/Directory.mk include $(APPDIR)/Directory.mk

2
canutils/libcanard/Makefile
View File

@ -109,3 +109,5 @@ distclean: clean
$(call DELFILE, $(LIBCANARD_PACKNAME)) $(call DELFILE, $(LIBCANARD_PACKNAME))
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
canutils/libuavcan/Makefile
View File

@ -262,3 +262,5 @@ distclean: clean
$(call DELFILE, $(PYUAVCAN_PACKNAME)) $(call DELFILE, $(PYUAVCAN_PACKNAME))
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

40
canutils/libuavcan/nuttx-b04396ace50155573e545ed9bf2fb09964ee2367.patch
View File

@ -23,3 +23,43 @@
} }
}; };
--- libuavcan/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp.orig 2016-06-05 09:12:29.086814547 -0600
+++ libuavcan/libuavcan_drivers/stm32/driver/src/uc_stm32_clock.cpp 2016-06-05 09:15:03.676810202 -0600
@@ -31,17 +31,30 @@
# if UAVCAN_STM32_NUTTX
# define TIMX UAVCAN_STM32_GLUE3(STM32_TIM, UAVCAN_STM32_TIMER_NUMBER, _BASE)
-# define TMR_REG(o) (TIMX + (o))
-# define TIMX_INPUT_CLOCK STM32_TIM27_FREQUENCY
+# define TMR_REG(o) (TIMX + (o))
-# define TIMX_IRQn UAVCAN_STM32_GLUE2(STM32_IRQ_TIM, UAVCAN_STM32_TIMER_NUMBER)
+# if UAVCAN_STM32_TIMER_NUMBER == 2
+# define TIMX_INPUT_CLOCK BOARD_TIM2_FREQUENCY
+# elif UAVCAN_STM32_TIMER_NUMBER == 3
+# define TIMX_INPUT_CLOCK BOARD_TIM3_FREQUENCY
+# elif UAVCAN_STM32_TIMER_NUMBER == 4
+# define TIMX_INPUT_CLOCK BOARD_TIM4_FREQUENCY
+# elif UAVCAN_STM32_TIMER_NUMBER == 5
+# define TIMX_INPUT_CLOCK BOARD_TIM5_FREQUENCY
+# elif UAVCAN_STM32_TIMER_NUMBER == 6
+# define TIMX_INPUT_CLOCK BOARD_TIM6_FREQUENCY
+# elif UAVCAN_STM32_TIMER_NUMBER == 7
+# define TIMX_INPUT_CLOCK BOARD_TIM7_FREQUENCY
+# endif
+
+# define TIMX_IRQn UAVCAN_STM32_GLUE2(STM32_IRQ_TIM, UAVCAN_STM32_TIMER_NUMBER)
# endif
# if UAVCAN_STM32_TIMER_NUMBER >= 2 && UAVCAN_STM32_TIMER_NUMBER <= 7
-# define TIMX_RCC_ENR RCC->APB1ENR
-# define TIMX_RCC_RSTR RCC->APB1RSTR
-# define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN)
-# define TIMX_RCC_RSTR_MASK UAVCAN_STM32_GLUE3(RCC_APB1RSTR_TIM, UAVCAN_STM32_TIMER_NUMBER, RST)
+# define TIMX_RCC_ENR RCC->APB1ENR
+# define TIMX_RCC_RSTR RCC->APB1RSTR
+# define TIMX_RCC_ENR_MASK UAVCAN_STM32_GLUE3(RCC_APB1ENR_TIM, UAVCAN_STM32_TIMER_NUMBER, EN)
+# define TIMX_RCC_RSTR_MASK UAVCAN_STM32_GLUE3(RCC_APB1RSTR_TIM, UAVCAN_STM32_TIMER_NUMBER, RST)
# else
# error "This UAVCAN_STM32_TIMER_NUMBER is not supported yet"
# endif

2
examples/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/Kconfig

102
examples/Kconfig
View File

@ -1,102 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "Examples"
source "$APPSDIR/examples/adc/Kconfig"
source "$APPSDIR/examples/ajoystick/Kconfig"
source "$APPSDIR/examples/alarm/Kconfig"
source "$APPSDIR/examples/bastest/Kconfig"
source "$APPSDIR/examples/bridge/Kconfig"
source "$APPSDIR/examples/buttons/Kconfig"
source "$APPSDIR/examples/can/Kconfig"
source "$APPSDIR/examples/cc3000/Kconfig"
source "$APPSDIR/examples/chat/Kconfig"
source "$APPSDIR/examples/configdata/Kconfig"
source "$APPSDIR/examples/cpuhog/Kconfig"
source "$APPSDIR/examples/cxxtest/Kconfig"
source "$APPSDIR/examples/dhcpd/Kconfig"
source "$APPSDIR/examples/djoystick/Kconfig"
source "$APPSDIR/examples/elf/Kconfig"
source "$APPSDIR/examples/fstest/Kconfig"
source "$APPSDIR/examples/ftpc/Kconfig"
source "$APPSDIR/examples/ftpd/Kconfig"
source "$APPSDIR/examples/hello/Kconfig"
source "$APPSDIR/examples/helloxx/Kconfig"
source "$APPSDIR/examples/json/Kconfig"
source "$APPSDIR/examples/hidkbd/Kconfig"
source "$APPSDIR/examples/keypadtest/Kconfig"
source "$APPSDIR/examples/igmp/Kconfig"
source "$APPSDIR/examples/i2schar/Kconfig"
source "$APPSDIR/examples/lcdrw/Kconfig"
source "$APPSDIR/examples/leds/Kconfig"
source "$APPSDIR/examples/ltdc/Kconfig"
source "$APPSDIR/examples/media/Kconfig"
source "$APPSDIR/examples/mm/Kconfig"
source "$APPSDIR/examples/modbus/Kconfig"
source "$APPSDIR/examples/module/Kconfig"
source "$APPSDIR/examples/mount/Kconfig"
source "$APPSDIR/examples/mtdpart/Kconfig"
source "$APPSDIR/examples/mtdrwb/Kconfig"
source "$APPSDIR/examples/netloop/Kconfig"
source "$APPSDIR/examples/netpkt/Kconfig"
source "$APPSDIR/examples/nettest/Kconfig"
source "$APPSDIR/examples/nrf24l01_term/Kconfig"
source "$APPSDIR/examples/nsh/Kconfig"
source "$APPSDIR/examples/null/Kconfig"
source "$APPSDIR/examples/nx/Kconfig"
source "$APPSDIR/examples/nxterm/Kconfig"
source "$APPSDIR/examples/nxffs/Kconfig"
source "$APPSDIR/examples/nxflat/Kconfig"
source "$APPSDIR/examples/nxhello/Kconfig"
source "$APPSDIR/examples/nximage/Kconfig"
source "$APPSDIR/examples/nxlines/Kconfig"
source "$APPSDIR/examples/nxtext/Kconfig"
source "$APPSDIR/examples/ostest/Kconfig"
source "$APPSDIR/examples/pashello/Kconfig"
source "$APPSDIR/examples/pca9635/Kconfig"
source "$APPSDIR/examples/pipe/Kconfig"
source "$APPSDIR/examples/poll/Kconfig"
source "$APPSDIR/examples/pppd/Kconfig"
source "$APPSDIR/examples/pwm/Kconfig"
source "$APPSDIR/examples/posix_spawn/Kconfig"
source "$APPSDIR/examples/qencoder/Kconfig"
source "$APPSDIR/examples/random/Kconfig"
source "$APPSDIR/examples/relays/Kconfig"
source "$APPSDIR/examples/rgbled/Kconfig"
source "$APPSDIR/examples/rgmp/Kconfig"
source "$APPSDIR/examples/romfs/Kconfig"
source "$APPSDIR/examples/sendmail/Kconfig"
source "$APPSDIR/examples/serialblaster/Kconfig"
source "$APPSDIR/examples/serialrx/Kconfig"
source "$APPSDIR/examples/serloop/Kconfig"
source "$APPSDIR/examples/slcd/Kconfig"
source "$APPSDIR/examples/flash_test/Kconfig"
source "$APPSDIR/examples/smart_test/Kconfig"
source "$APPSDIR/examples/smart/Kconfig"
source "$APPSDIR/examples/smp/Kconfig"
source "$APPSDIR/examples/tcpecho/Kconfig"
source "$APPSDIR/examples/telnetd/Kconfig"
source "$APPSDIR/examples/thttpd/Kconfig"
source "$APPSDIR/examples/timer/Kconfig"
source "$APPSDIR/examples/tiff/Kconfig"
source "$APPSDIR/examples/touchscreen/Kconfig"
source "$APPSDIR/examples/uavcan/Kconfig"
source "$APPSDIR/examples/udp/Kconfig"
source "$APPSDIR/examples/udpblaster/Kconfig"
source "$APPSDIR/examples/discover/Kconfig"
source "$APPSDIR/examples/webserver/Kconfig"
source "$APPSDIR/examples/unionfs/Kconfig"
source "$APPSDIR/examples/usbserial/Kconfig"
source "$APPSDIR/examples/usbterm/Kconfig"
source "$APPSDIR/examples/udgram/Kconfig"
source "$APPSDIR/examples/ustream/Kconfig"
source "$APPSDIR/examples/watchdog/Kconfig"
source "$APPSDIR/examples/wget/Kconfig"
source "$APPSDIR/examples/wgetjson/Kconfig"
source "$APPSDIR/examples/xmlrpc/Kconfig"
source "$APPSDIR/examples/zerocross/Kconfig"
endmenu # Examples

2
examples/Makefile
View File

@ -33,4 +33,6 @@
# #
############################################################################ ############################################################################
MENUDESC = "Examples"
include $(APPDIR)/Directory.mk include $(APPDIR)/Directory.mk

2
examples/bastest/Makefile
View File

@ -157,3 +157,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/bridge/Makefile
View File

@ -166,3 +166,5 @@ distclean: clean
$(call DELFILE, bridge_config.h) $(call DELFILE, bridge_config.h)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/cc3000/Makefile
View File

@ -154,3 +154,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/chat/Makefile
View File

@ -130,3 +130,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/configdata/Makefile
View File

@ -37,6 +37,8 @@
# CONFIGDATA Unit Test # CONFIGDATA Unit Test
APPNAME = configdata
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = configdata_main.c MAINSRC = configdata_main.c

2
examples/elf/Makefile
View File

@ -136,3 +136,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/ftpd/Makefile
View File

@ -133,3 +133,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/hidkbd/Makefile
View File

@ -37,6 +37,8 @@
# USB Host HID keyboard Example # USB Host HID keyboard Example
APPNAME = hidkbd
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = hidkbd_main.c MAINSRC = hidkbd_main.c

2
examples/mm/Makefile
View File

@ -37,6 +37,8 @@
# Memory Management Test # Memory Management Test
APPNAME = mm
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = mm_main.c MAINSRC = mm_main.c

2
examples/module/Makefile
View File

@ -153,3 +153,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/mount/Makefile
View File

@ -37,6 +37,8 @@
# mount() test # mount() test
APPNAME = mount
ASRCS = ASRCS =
CSRCS = ramdisk.c CSRCS = ramdisk.c
MAINSRC = mount_main.c MAINSRC = mount_main.c

6
examples/mtdpart/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examples/mtdpart/Makefile # apps/examples/mtdpart/Makefile
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,7 +35,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# Hello, World! Example # MTD Partition Example
APPNAME = mtdpart
ASRCS = ASRCS =
CSRCS = CSRCS =

6
examples/mtdpart/mtdpart_main.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* examples/mtdpart/mtdpart_main.c * examples/mtdpart/mtdpart_main.c
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -127,10 +127,6 @@ static uint8_t g_simflash[MTDPART_BUFSIZE];
extern FAR struct mtd_dev_s *mtdpart_archinitialize(void); extern FAR struct mtd_dev_s *mtdpart_archinitialize(void);
#endif #endif
/****************************************************************************
* Private Functions
****************************************************************************/
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
****************************************************************************/ ****************************************************************************/

6
examples/mtdrwb/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examplex/mtdrwb/Makefile # apps/examplex/mtdrwb/Makefile
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,7 +35,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# Hello, World! Example # MTD R/W buffer test Example
APPNAME = mtdrwb
ASRCS = ASRCS =
CSRCS = CSRCS =

2
examples/nettest/Makefile
View File

@ -187,3 +187,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/nsh/Makefile
View File

@ -37,6 +37,8 @@
# NuttShell (NSH) Example # NuttShell (NSH) Example
APPNAME = nsh
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = nsh_main.c MAINSRC = nsh_main.c

6
examples/nxffs/Makefile
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/examples/nxffs/Makefile # apps/examples/nxffs/Makefile
# #
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Copyright (C) 2011-2012, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -35,7 +35,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# Hello, World! Example # NXFFS file system example
APPNAME = nxffs
ASRCS = ASRCS =
CSRCS = CSRCS =

2
examples/nxflat/Makefile
View File

@ -127,3 +127,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

4
examples/ostest/posixtimer.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* examples/ostest/posixtimer.c * examples/ostest/posixtimer.c
* *
* Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2007-2009, 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -258,7 +258,7 @@ errorout:
/* Detach the signal handler */ /* Detach the signal handler */
act.sa_sigaction = SIG_DFL; act.sa_handler = SIG_DFL;
status = sigaction(MY_TIMER_SIGNAL, &act, &oact); status = sigaction(MY_TIMER_SIGNAL, &act, &oact);
printf("timer_test: done\n" ); printf("timer_test: done\n" );

6
examples/ostest/sighand.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* apps/examples/ostest/sighand.c * apps/examples/ostest/sighand.c
* *
* Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved. * Copyright (C) 2007, 2008, 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -213,7 +213,7 @@ static int waiter_main(int argc, char *argv[])
/* Detach the signal handler */ /* Detach the signal handler */
act.sa_sigaction = SIG_DFL; act.sa_handler = SIG_DFL;
(void)sigaction(WAKEUP_SIGNAL, &act, &oact); (void)sigaction(WAKEUP_SIGNAL, &act, &oact);
printf("waiter_main: done\n" ); printf("waiter_main: done\n" );
@ -331,7 +331,7 @@ void sighand_test(void)
/* Detach the signal handler */ /* Detach the signal handler */
#ifdef CONFIG_SCHED_HAVE_PARENT #ifdef CONFIG_SCHED_HAVE_PARENT
act.sa_sigaction = SIG_DFL; act.sa_handler = SIG_DFL;
(void)sigaction(SIGCHLD, &act, &oact); (void)sigaction(SIGCHLD, &act, &oact);
#endif #endif

2
examples/pashello/Makefile
View File

@ -37,6 +37,8 @@
# Pascal Add-On Example # Pascal Add-On Example
APPNAME = pashello
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
endif endif

2
examples/pipe/Makefile
View File

@ -37,6 +37,8 @@
# Pipe Example # Pipe Example
APPNAME = pipe
ASRCS = ASRCS =
CSRCS = transfer_test.c interlock_test.c redirect_test.c CSRCS = transfer_test.c interlock_test.c redirect_test.c
MAINSRC = pipe_main.c MAINSRC = pipe_main.c

2
examples/poll/Makefile
View File

@ -125,3 +125,5 @@ distclean: clean
$(call DELFILE, *.dSYM) $(call DELFILE, *.dSYM)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/posix_spawn/Makefile
View File

@ -156,3 +156,5 @@ spawn_main.o: spawn_main.c \
symtab.o: filesystem/symtab.c \ symtab.o: filesystem/symtab.c \
$(TOPDIR)/include/nuttx/compiler.h \ $(TOPDIR)/include/nuttx/compiler.h \
$(TOPDIR)/include/nuttx/binfmt/symtab.h $(TOPDIR)/include/nuttx/binfmt/symtab.h
.PHONY: preconfig
preconfig:

2
examples/rgmp/Makefile
View File

@ -37,6 +37,8 @@
# The smallest thing you can build -- the NULL example. # The smallest thing you can build -- the NULL example.
APPNAME = rgmp
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = rgmp_main.c MAINSRC = rgmp_main.c

2
examples/romfs/Makefile
View File

@ -153,3 +153,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/sendmail/Makefile
View File

@ -37,6 +37,8 @@
# Sendmail SMTP Example # Sendmail SMTP Example
APPNAME = sendmail
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = sendmail_main.c MAINSRC = sendmail_main.c

2
examples/serloop/Makefile
View File

@ -37,6 +37,8 @@
# Mindlessly simple console loopack test # Mindlessly simple console loopack test
APPNAME = serloop
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = serloop_main.c MAINSRC = serloop_main.c

2
examples/smart/Makefile
View File

@ -37,6 +37,8 @@
# SMART file system stress test # SMART file system stress test
APPNAME = smart
ASRCS = ASRCS =
CSRCS = CSRCS =
MAINSRC = smart_main.c MAINSRC = smart_main.c

2
examples/thttpd/Makefile
View File

@ -137,3 +137,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/tiff/Makefile
View File

@ -138,3 +138,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/uavcan/Makefile
View File

@ -35,6 +35,8 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
APPNAME = uavcan
MAINSRC = uavcan_main.cxx MAINSRC = uavcan_main.cxx
CXXFLAGS += -I$(TOPDIR)/include/apps CXXFLAGS += -I$(TOPDIR)/include/apps

2
examples/udgram/Makefile
View File

@ -179,3 +179,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/udp/Makefile
View File

@ -158,3 +158,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/udpblaster/Makefile
View File

@ -167,3 +167,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/unionfs/Makefile
View File

@ -157,3 +157,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/usbserial/Makefile
View File

@ -135,3 +135,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/ustream/Makefile
View File

@ -171,3 +171,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/webserver/Makefile
View File

@ -140,3 +140,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
examples/wget/Makefile
View File

@ -41,6 +41,8 @@ ASRCS =
CSRCS = CSRCS =
MAINSRC = wget_main.c MAINSRC = wget_main.c
APPNAME = wget
CONFIG_XYZ_PROGNAME ?= wget$(EXEEXT) CONFIG_XYZ_PROGNAME ?= wget$(EXEEXT)
PROGNAME = $(CONFIG_XYZ_PROGNAME) PROGNAME = $(CONFIG_XYZ_PROGNAME)

2
fsutils/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/Kconfig

13
fsutils/Kconfig
View File

@ -1,13 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "File System Utilities"
source "$APPSDIR/fsutils/flash_eraseall/Kconfig"
source "$APPSDIR/fsutils/inifile/Kconfig"
source "$APPSDIR/fsutils/mksmartfs/Kconfig"
source "$APPSDIR/fsutils/passwd/Kconfig"
endmenu # FS Utilities

2
fsutils/Makefile
View File

@ -33,4 +33,6 @@
# #
############################################################################ ############################################################################
MENUDESC = "File System Utilities"
include $(APPDIR)/Directory.mk include $(APPDIR)/Directory.mk

2
fsutils/flash_eraseall/Makefile
View File

@ -83,6 +83,8 @@ $(COBJS): %$(OBJEXT): %.c
install: install:
preconfig:
context: context:
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)

2
fsutils/inifile/Makefile
View File

@ -96,3 +96,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
fsutils/mksmartfs/Makefile
View File

@ -102,3 +102,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
fsutils/passwd/Makefile
View File

@ -108,3 +108,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
gpsutils/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/Kconfig

10
gpsutils/Kconfig
View File

@ -1,10 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "GPS Utilities"
source "$APPSDIR/gpsutils/minmea/Kconfig"
endmenu # GPS Utilities

2
gpsutils/Makefile
View File

@ -33,4 +33,6 @@
# #
############################################################################ ############################################################################
MENUDESC = "GPS Utilities"
include $(APPDIR)/Directory.mk include $(APPDIR)/Directory.mk

2
gpsutils/minmea/Makefile
View File

@ -97,3 +97,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
graphics/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
/Kconfig

36
graphics/Kconfig
View File

@ -1,36 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "Graphics Support"
config TIFF
bool "TIFF file generation library"
default n
---help---
Enable support for the TIFF file generation program.
if TIFF
menu "TIFF Screenshot Utility"
source "$APPSDIR/graphics/screenshot/Kconfig"
endmenu
endif # TIFF
config GRAPHICS_TRAVELER
bool "Traveler game"
default n
select FSUTILS_INIFILE
---help---
Enable or disable the graphic Traveler game
if GRAPHICS_TRAVELER
menu "Traveler game"
source "$APPSDIR/graphics/traveler/Kconfig"
endmenu
endif # GRAPHICS_TRAVELER
endmenu # Graphics Support

12
graphics/Make.defs
View File

@ -34,14 +34,4 @@
# #
############################################################################ ############################################################################
ifeq ($(CONFIG_TIFF),y) include $(wildcard graphics/*/Make.defs)
CONFIGURED_APPS += graphics/tiff
endif
ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y)
CONFIGURED_APPS += graphics/screenshot
endif
ifeq ($(CONFIG_GRAPHICS_TRAVELER),y)
CONFIGURED_APPS += graphics/traveler
endif

38
graphics/Makefile
View File

@ -33,40 +33,6 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config MENUDESC = "Graphics Support"
# Sub-directories
SUBDIRS = tiff screenshot traveler
# Sub-directories that might need context setup
CNTXTDIRS =
all: nothing
.PHONY: nothing context depend clean distclean
define SDIR_template
$(1)_$(2):
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef
# $(foreach SDIR, $(CNTXTDIRS), $(eval $(call SDIR_template,$(SDIR),context)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
nothing:
install:
context: # $(foreach SDIR, $(CNTXTDIRS), $(SDIR)_context)
depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
distclean: clean $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)
-include Make.dep
include $(APPDIR)/Directory.mk

39
graphics/screenshot/Make.defs Normal file
View File

@ -0,0 +1,39 @@
############################################################################
# apps/graphics/screenshot/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2012 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.
#
############################################################################
ifeq ($(CONFIG_GRAPHICS_SCREENSHOT),y)
CONFIGURED_APPS += graphics/screenshot
endif

2
graphics/screenshot/Makefile
View File

@ -139,3 +139,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

9
graphics/tiff/Kconfig Normal file
View File

@ -0,0 +1,9 @@
config TIFF
bool "TIFF file generation library"
default n
---help---
Enable support for the TIFF file generation program.
if TIFF
endif # TIFF

39
graphics/tiff/Make.defs Normal file
View File

@ -0,0 +1,39 @@
############################################################################
# apps/graphics/tiff/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2012 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.
#
############################################################################
ifeq ($(CONFIG_TIFF),y)
CONFIGURED_APPS += graphics/tiff
endif

2
graphics/tiff/Makefile
View File

@ -96,3 +96,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

7
graphics/traveler/Kconfig
View File

@ -2,8 +2,15 @@
# For a description of the syntax of this configuration file, # For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
config GRAPHICS_TRAVELER
bool "Traveler game"
default n
select FSUTILS_INIFILE
---help---
Enable or disable the graphic Traveler game
if GRAPHICS_TRAVELER if GRAPHICS_TRAVELER
comment "Color configuration" comment "Color configuration"
choice choice

40
graphics/traveler/Make.defs Normal file
View File

@ -0,0 +1,40 @@
############################################################################
# apps/graphics/traveler/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2012 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.
#
############################################################################
ifeq ($(CONFIG_GRAPHICS_TRAVELER),y)
CONFIGURED_APPS += graphics/traveler
endif

2
graphics/traveler/Makefile
View File

@ -183,3 +183,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

3
interpreters/.gitignore vendored
View File

@ -1 +1,2 @@
/pcode /Kconfig

16
interpreters/Make.defs
View File

@ -34,18 +34,4 @@
# #
############################################################################ ############################################################################
ifeq ($(CONFIG_INTERPRETERS_BAS),y) include $(wildcard interpreters/*/Make.defs)
CONFIGURED_APPS += interpreters/bas
endif
ifeq ($(CONFIG_INTERPRETERS_FICL),y)
CONFIGURED_APPS += interpreters/ficl
endif
ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y)
CONFIGURED_APPS += interpreters/micropython
endif
ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
CONFIGURED_APPS += interpreters/pcode
endif

44
interpreters/Makefile
View File

@ -33,46 +33,6 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config MENUDESC = "Interpreters"
# Sub-directories containing interpreter runtime include $(APPDIR)/Directory.mk
SUBDIRS = bas ficl micropython pcode prun
# Create the list of installed runtime modules (INSTALLED_DIRS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define ADD_DIRECTORY
INSTALLED_DIRS += ${shell if exist $1\Makefile (echo $1)}
endef
else
define ADD_DIRECTORY
INSTALLED_DIRS += ${shell if [ -r $1/Makefile ]; then echo "$1"; fi}
endef
endif
$(foreach DIR, $(SUBDIRS), $(eval $(call ADD_DIRECTORY,$(DIR))))
all: nothing
.PHONY: nothing context depend clean distclean
define SDIR_template
$(1)_$(2):
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(foreach SDIR, $(INSTALLED_DIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
nothing:
install:
context:
depend: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_clean)
distclean: $(foreach SDIR, $(INSTALLED_DIRS), $(SDIR)_distclean)

4
interpreters/bas/Make.defs Normal file
View File

@ -0,0 +1,4 @@
ifeq ($(CONFIG_INTERPRETERS_BAS),y)
CONFIGURED_APPS += interpreters/bas
endif

3
interpreters/bas/Makefile
View File

@ -120,3 +120,6 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

4
interpreters/ficl/Make.defs Normal file
View File

@ -0,0 +1,4 @@
ifeq ($(CONFIG_INTERPRETERS_FICL),y)
CONFIGURED_APPS += interpreters/ficl
endif

2
interpreters/ficl/Makefile
View File

@ -118,3 +118,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

4
interpreters/micropython/Make.defs Normal file
View File

@ -0,0 +1,4 @@
ifeq ($(CONFIG_INTERPRETERS_MICROPYTHON),y)
CONFIGURED_APPS += interpreters/micropython
endif

2
interpreters/micropython/Makefile
View File

@ -182,3 +182,5 @@ distclean: clean
-include $(MICROPYTHON_SRCDIR)/mkrules.mk -include $(MICROPYTHON_SRCDIR)/mkrules.mk
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

12
interpreters/Kconfig → interpreters/pcode/Kconfig
View File

@ -1,13 +1,3 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "Interpreters"
source "$APPSDIR/interpreters/bas/Kconfig"
source "$APPSDIR/interpreters/ficl/Kconfig"
config INTERPRETERS_PCODE config INTERPRETERS_PCODE
bool "Pascal p-code interpreter" bool "Pascal p-code interpreter"
default n default n
@ -21,5 +11,3 @@ config INTERPRETERS_PCODE
if INTERPRETERS_PCODE if INTERPRETERS_PCODE
endif endif
source "$APPSDIR/interpreters/micropython/Kconfig"
endmenu # Interpreters

4
interpreters/pcode/Make.defs Normal file
View File

@ -0,0 +1,4 @@
ifeq ($(CONFIG_INTERPRETERS_PCODE),y)
CONFIGURED_APPS += interpreters/pcode
endif

2
modbus/Makefile
View File

@ -119,3 +119,5 @@ distclean: clean
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

2
netutils/.gitignore vendored
View File

@ -13,3 +13,5 @@
*.adb *.adb
*.lib *.lib
*.src *.src
/Kconfig

28
netutils/Kconfig
View File

@ -1,28 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menu "Network Utilities"
source "$APPSDIR/netutils/chat/Kconfig"
source "$APPSDIR/netutils/codecs/Kconfig"
source "$APPSDIR/netutils/dhcpc/Kconfig"
source "$APPSDIR/netutils/dhcpd/Kconfig"
source "$APPSDIR/netutils/esp8266/Kconfig"
source "$APPSDIR/netutils/ftpc/Kconfig"
source "$APPSDIR/netutils/ftpd/Kconfig"
source "$APPSDIR/netutils/json/Kconfig"
source "$APPSDIR/netutils/smtp/Kconfig"
source "$APPSDIR/netutils/telnetd/Kconfig"
source "$APPSDIR/netutils/tftpc/Kconfig"
source "$APPSDIR/netutils/thttpd/Kconfig"
source "$APPSDIR/netutils/netlib/Kconfig"
source "$APPSDIR/netutils/webclient/Kconfig"
source "$APPSDIR/netutils/webserver/Kconfig"
source "$APPSDIR/netutils/ntpclient/Kconfig"
source "$APPSDIR/netutils/discover/Kconfig"
source "$APPSDIR/netutils/xmlrpc/Kconfig"
source "$APPSDIR/netutils/pppd/Kconfig"
endmenu # Network Utilities

76
netutils/Make.defs
View File

@ -34,78 +34,4 @@
# #
############################################################################ ############################################################################
ifeq ($(CONFIG_NETUTILS_CHAT),y) include $(wildcard netutils/*/Make.defs)
CONFIGURED_APPS += netutils/chat
endif
ifeq ($(CONFIG_NETUTILS_CODECS),y)
CONFIGURED_APPS += netutils/codecs
endif
ifeq ($(CONFIG_NETUTILS_DHCPC),y)
CONFIGURED_APPS += netutils/dhcpc
endif
ifeq ($(CONFIG_NETUTILS_DHCPD),y)
CONFIGURED_APPS += netutils/dhcpd
endif
ifeq ($(CONFIG_NETUTILS_ESP8266),y)
CONFIGURED_APPS += netutils/esp8266
endif
ifeq ($(CONFIG_NETUTILS_FTPC),y)
CONFIGURED_APPS += netutils/ftpc
endif
ifeq ($(CONFIG_NETUTILS_FTPD),y)
CONFIGURED_APPS += netutils/ftpd
endif
ifeq ($(CONFIG_NETUTILS_JSON),y)
CONFIGURED_APPS += netutils/json
endif
ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
CONFIGURED_APPS += netutils/ntpclient
endif
ifeq ($(CONFIG_NETUTILS_PPPD),y)
CONFIGURED_APPS += netutils/pppd
endif
ifeq ($(CONFIG_NETUTILS_SMTP),y)
CONFIGURED_APPS += netutils/smtp
endif
ifeq ($(CONFIG_NETUTILS_TELNETD),y)
CONFIGURED_APPS += netutils/telnetd
endif
ifeq ($(CONFIG_NETUTILS_TFTPC),y)
CONFIGURED_APPS += netutils/tftpc
endif
ifeq ($(CONFIG_NETUTILS_THTTPD),y)
CONFIGURED_APPS += netutils/thttpd
endif
ifeq ($(CONFIG_NETUTILS_NETLIB),y)
CONFIGURED_APPS += netutils/netlib
endif
ifeq ($(CONFIG_NETUTILS_WEBCLIENT),y)
CONFIGURED_APPS += netutils/webclient
endif
ifeq ($(CONFIG_NETUTILS_WEBSERVER),y)
CONFIGURED_APPS += netutils/webserver
endif
ifeq ($(CONFIG_NETUTILS_DISCOVER),y)
CONFIGURED_APPS += netutils/discover
endif
ifeq ($(CONFIG_NETUTILS_XMLRPC),y)
CONFIGURED_APPS += netutils/xmlrpc
endif

35
netutils/Makefile
View File

@ -33,37 +33,6 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config # Current configuration MENUDESC = "Network Utilities"
# Sub-directories include $(APPDIR)/Directory.mk
SUBDIRS = chat json codecs esp8266
ifeq ($(CONFIG_NET),y)
SUBDIRS += netlib dhcpc dhcpd discover ftpc ftpd smtp telnetd
SUBDIRS += webclient webserver tftpc thttpd xmlrpc pppd
endif
all: nothing
.PHONY: nothing context depend clean distclean
define SDIR_template
$(1)_$(2):
$(Q) $(MAKE) -C $(1) $(2) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
endef
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),depend)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(foreach SDIR, $(SUBDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
nothing:
install:
context:
depend: $(foreach SDIR, $(SUBDIRS), $(SDIR)_depend)
clean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_clean)
distclean: $(foreach SDIR, $(SUBDIRS), $(SDIR)_distclean)

40
netutils/chat/Make.defs Normal file
View File

@ -0,0 +1,40 @@
############################################################################
# apps/netutils/chat/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2016 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.
#
############################################################################
ifeq ($(CONFIG_NETUTILS_CHAT),y)
CONFIGURED_APPS += netutils/chat
endif

2
netutils/chat/Makefile
View File

@ -96,3 +96,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

39
netutils/codecs/Make.defs Normal file
View File

@ -0,0 +1,39 @@
# apps/netutils/codecs/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2016 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.
#
############################################################################
ifeq ($(CONFIG_NETUTILS_CODECS),y)
CONFIGURED_APPS += netutils/codecs
endif

2
netutils/codecs/Makefile
View File

@ -94,3 +94,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

39
netutils/dhcpc/Make.defs Normal file
View File

@ -0,0 +1,39 @@
# apps/netutils/dhcpc/Make.defs
# Adds selected applications to apps/ build
#
# Copyright (C) 2016 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.
#
############################################################################
ifeq ($(CONFIG_NETUTILS_DHCPC),y)
CONFIGURED_APPS += netutils/dhcpc
endif

2
netutils/dhcpc/Makefile
View File

@ -100,3 +100,5 @@ distclean: clean
$(call DELFILE, .depend) $(call DELFILE, .depend)
-include Make.dep -include Make.dep
.PHONY: preconfig
preconfig:

Some files were not shown because too many files have changed in this diff Show More