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

apps/ initialization now occurs during the earlier context build phase

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3412 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-24 00:28:50 +00:00
parent 35ff9cc3dd
commit 0da11876b0
37 changed files with 144 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog.txt
View File

@ -3,14 +3,19 @@
* Initial version of the apps/ directory was released as contributed by
Uros Platise.
5.20 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
6.0 2011-03-21 Gregory Nutt <spudmonkey@racsa.co.cr>
* README.txt -- README cosmetics
* hello/ -- hello world minor changes
* Makefile -- Makefile cosmetics (I am slowly adding the Darjeeling JVM)
* Make.defs -- New file adds common make definitions for applications.
* hello/Makefile -- Now uses new Make.defs definitions. Added README.txt.
* apps/poweroff -- New application to turn off board power.
* Moved NSH library, netutils, and examples from the nuttx/ directory to
the apps/ directory
* Moved exec_nuttapp machinery into the nuttapp/ directory.
* apps/poweroff -- New application to turn off board power.
* Moved NSH library, netutils, and examples from the nuttx/ directory to
the apps/ directory
* Moved exec_nuttapp machinery into the nuttapp/ directory.
6.0 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* Creation of auto-generated header files now occurs during the context
build phase.

15
Makefile
View File

@ -91,7 +91,7 @@ BIN = libapps$(LIBEXT)
# Build targets
all: $(BIN)
.PHONY: $(BUILTIN_APPS_BUILT) .depend depend clean distclean
.PHONY: $(BUILTIN_APPS_BUILT) context depend clean distclean
$(BUILTIN_APPS_BUILT):
@for dir in $(BUILTIN_APPS_DIR) ; do \
@ -103,7 +103,16 @@ $(BIN): $(BUILTIN_APPS_BUILT)
$(call ARCHIVE, $@, $${obj}); \
done ; )
.depend: Makefile $(SRCS)
.context:
@for dir in $(BUILTIN_APPS_DIR) ; do \
rm -f $$dir/.context ; \
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR) context ; \
done
@touch $@
context: .context
.depend: context Makefile $(SRCS)
@for dir in $(BUILTIN_APPS_DIR) ; do \
rm -f $$dir/.depend ; \
$(MAKE) -C $$dir TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR) depend ; \
@ -123,5 +132,5 @@ distclean: clean
@for dir in $(SUBDIRS) ; do \
$(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \
done
@rm -f .config .depend
@rm -f .config .context .depend

6
README.txt
View File

@ -9,7 +9,9 @@ in two files:
- exec_nuttapp_proto.h Entry points, prototype function
- exec_nuttapp_list.h Application specific information and requirements
Information is collected during the make .depend process.
The build occurs in several phases as different build targets are executed:
(1) contex, (2) depend, and (3) default (all). Application information is
collected during the make context build phase.
To execute an application function:
@ -34,7 +36,7 @@ CONFIGURED_APPS list like:
CONFIGURED_APPS += hello/.built_always poweroff/.built_always jvm/.built_always
The form of each entry is <dir>/<dependency> when:
The form of each entry is <dir>=<dependency> when:
<dir> is the name of a subdirectory in the apps directory, and

4
examples/Makefile
View File

@ -42,10 +42,12 @@ SUBDIRS = dhcpd hello helloxx hidkbd igmp mm mount nettest nsh null nx \
udp uip usbserial usbstorage wget wlan
all: nothing
.PHONY: nothing depend clean distclean
.PHONY: nothing context depend clean distclean
nothing:
context:
depend:
@for dir in $(SUBDIRS) ; do \
$(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \

2
examples/dhcpd/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/hello/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/helloxx/Makefile
View File

@ -87,7 +87,7 @@ $(BIN): chkcxx $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/hidkbd/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/igmp/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/mm/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/mount/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/nsh/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/null/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/nx/Makefile
View File

@ -73,7 +73,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/nxflat/Makefile
View File

@ -73,7 +73,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
# We can't make dependencies in this directory because the required

2
examples/ostest/Makefile
View File

@ -110,7 +110,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/pashello/Makefile
View File

@ -77,7 +77,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/pipe/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/poll/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/romfs/Makefile
View File

@ -86,7 +86,7 @@ $(BIN): romfs_testdir.h $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/sendmail/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/serloop/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/thttpd/Makefile
View File

@ -73,7 +73,7 @@ $(BIN): headers $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/uip/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/usbserial/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/usbstorage/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/wget/Makefile
View File

@ -70,7 +70,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

2
examples/wlan/Makefile
View File

@ -71,7 +71,7 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $${obj}); \
done ; )
@touch .built
.built: $(BIN)
.depend: Makefile $(SRCS)

4
netutils/Makefile
View File

@ -42,10 +42,12 @@ SUBDIRS = uiplib dhcpc dhcpd resolv smtp telnetd webclient webserver tftpc thttp
endif
all: nothing
.PHONY: nothing depend clean distclean
.PHONY: nothing context depend clean distclean
nothing:
context:
depend:
@for dir in $(SUBDIRS) ; do \
$(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \

8
nshlib/Makefile
View File

@ -76,12 +76,12 @@ OBJS = $(AOBJS) $(COBJS)
BIN = $(APPDIR)/libapps$(LIBEXT)
ROOTDEPPATH = --dep-path .
# Common build
VPATH =
# Build targets
all: .built
.PHONY: context .depend depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -97,6 +97,8 @@ $(BIN): $(OBJS)
.built: $(BIN)
context:
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep

13
nuttapp/Makefile
View File

@ -58,7 +58,7 @@ VPATH =
# Build Targets
all: .built
.PHONY: depend .depend clean distclean
.PHONY: .context context .depend depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -74,9 +74,14 @@ $(BIN): $(OBJS)
.built: $(BIN)
.context:
@echo "/* List of application requirements, generated during make context. */" > exec_nuttapp_list.h
@echo "/* List of application entry points, generated during make context. */" > exec_nuttapp_proto.h
@touch $@
context: .context
.depend: Makefile $(SRCS)
@echo "/* List of application requirements, generated during make depend. */" > exec_nuttapp_list.h
@echo "/* List of application entry points, generated during make depend. */" > exec_nuttapp_proto.h
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
@ -87,7 +92,7 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
@rm -f exec_nuttapp_list.h
@rm -f exec_nuttapp_proto.h

10
vsn/Makefile
View File

@ -40,10 +40,18 @@
SUBDIRS = free hello poweroff ramtron sdcard
all: nothing
.PHONY: nothing depend clean distclean
.PHONY: nothing context depend clean distclean
nothing:
.context:
@for dir in $(SUBDIRS) ; do \
$(MAKE) -C $$dir context TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \
done
@touch $@
context: .context
depend:
@for dir in $(SUBDIRS) ; do \
$(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \

18
vsn/free/Makefile
View File

@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path .
VPATH =
all: .built
.PHONY: .built context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -85,13 +86,20 @@ $(BIN): $(OBJS)
.built: $(BIN)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
# Register application
.context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
# Register application
context: .context
# Create dependencies
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
depend: .depend
clean:
@ -99,6 +107,6 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
-include Make.dep

18
vsn/hello/Makefile
View File

@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path .
VPATH =
all: .built
.PHONY: .built context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -85,13 +86,20 @@ $(BIN): $(OBJS)
.built: $(BIN)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
# Register application
.context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
# Register application
context: .context
# Create dependencies
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
depend: .depend
clean:
@ -99,6 +107,6 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
-include Make.dep

18
vsn/poweroff/Makefile
View File

@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path .
VPATH =
all: .built
.PHONY: .built context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -85,13 +86,20 @@ $(BIN): $(OBJS)
.built: $(BIN)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
# Register application
.context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
# Register application
context: .context
# Create dependencies
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
depend: .depend
clean:
@ -99,6 +107,6 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
-include Make.dep

18
vsn/ramtron/Makefile
View File

@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path .
VPATH =
all: .built
.PHONY: .built context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -85,13 +86,20 @@ $(BIN): $(OBJS)
.built: $(BIN)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
# Register application
.context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
# Register application
context: .context
# Create dependencies
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
depend: .depend
clean:
@ -99,6 +107,6 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
-include Make.dep

18
vsn/sdcard/Makefile
View File

@ -70,6 +70,7 @@ ROOTDEPPATH = --dep-path .
VPATH =
all: .built
.PHONY: .built context depend clean distclean
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -85,13 +86,20 @@ $(BIN): $(OBJS)
.built: $(BIN)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) \
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
# Register application
.context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@
# Register application
context: .context
# Create dependencies
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@
depend: .depend
clean:
@ -99,6 +107,6 @@ clean:
$(call CLEAN)
distclean: clean
@rm -f Make.dep .depend
@rm -f .context Make.dep .depend
-include Make.dep