Move VSN apps to apps/vsn
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3397 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
parent
2ecb272fe1
commit
de5c0b4035
|
|
@ -36,6 +36,6 @@
|
|||
|
||||
define REGISTER
|
||||
@echo "Register: $1"
|
||||
@echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> ../exec_nuttapp_list.h
|
||||
@echo "EXTERN int $4(int argc, char *argv[]);" >> ../exec_nuttapp_proto.h
|
||||
@echo "{ .name = \"$1\", .priority = $2, .stacksize = $3, .main = $4 }," >> "$(APPDIR)/exec_nuttapp_list.h"
|
||||
@echo "EXTERN int $4(int argc, char *argv[]);" >> "$(APPDIR)/exec_nuttapp_proto.h"
|
||||
endef
|
||||
|
|
|
|||
|
|
@ -42,8 +42,14 @@ endif
|
|||
|
||||
# Application Directories
|
||||
|
||||
# SUBDIRS is the list of all directories containing Makefiles. It is used
|
||||
# only for cleaning.
|
||||
|
||||
SUBDIRS = nshlib vsn
|
||||
|
||||
# we use a non-existing .built_always to guarantee that Makefile
|
||||
# always walks into the sub-directories and asks for build
|
||||
|
||||
BUILTIN_APPS_BUILT =
|
||||
BUILTIN_APPS_DIR =
|
||||
|
||||
|
|
@ -130,15 +136,21 @@ $(BIN): $(OBJS) $(BUILTIN_APPS_BUILT)
|
|||
|
||||
depend: .depend
|
||||
|
||||
define MAKECLEAN
|
||||
@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
|
||||
endef
|
||||
|
||||
clean:
|
||||
@rm -f $(BIN) *~ .*.swp *.o libapps.a
|
||||
$(call CLEAN)
|
||||
$(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),clean)))
|
||||
|
||||
distclean: clean
|
||||
@rm -f .config
|
||||
@rm -f Make.dep .depend
|
||||
@rm -f exec_nuttapp_list.h
|
||||
@rm -f exec_nuttapp_proto.h
|
||||
$(foreach DIR, $(SUBDIRS), $(eval $(call MAKECLEAN,$(DIR),distclean)))
|
||||
|
||||
-include Make.dep
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
############################################################################
|
||||
# vsn/Makefile
|
||||
#
|
||||
# Copyright (C) 2011 Gregory Nutt. All rights reserved.
|
||||
# Author: Gregory Nutt <spudmonkey@racsa.co.cr>
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
############################################################################
|
||||
|
||||
# Sub-directories
|
||||
|
||||
SUBDIRS = free hello poweroff ramtron sdcard
|
||||
|
||||
all: nothing
|
||||
.PHONY: nothing
|
||||
|
||||
nothing:
|
||||
|
||||
define DOMAKE
|
||||
@(MAKE) -C $1 $2 TOPDIR="$(TOPDIR)"
|
||||
endef
|
||||
|
||||
depend:
|
||||
$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),depend)))
|
||||
|
||||
clean:
|
||||
$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),clean)))
|
||||
|
||||
distclean: clean
|
||||
$(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),distclean)))
|
||||
|
||||
-include Make.dep
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
# sourcing the Make.defs!
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
include ../Make.defs
|
||||
include ../../Make.defs
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
|
|||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = ../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
# sourcing the Make.defs!
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
include ../Make.defs
|
||||
include ../../Make.defs
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
|
|||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = ../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
# sourcing the Make.defs!
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
include ../Make.defs
|
||||
include ../../Make.defs
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
|
|||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = ../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
# sourcing the Make.defs!
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
include ../Make.defs
|
||||
include ../../Make.defs
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
|
|||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = ../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
# sourcing the Make.defs!
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
include ../Make.defs
|
||||
include ../../Make.defs
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
@ -60,7 +60,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
|
|||
SRCS = $(ASRCS) $(CSRCS)
|
||||
OBJS = $(AOBJS) $(COBJS)
|
||||
|
||||
BIN = ../libapps$(LIBEXT)
|
||||
BIN = ../../libapps$(LIBEXT)
|
||||
|
||||
ROOTDEPPATH = --dep-path .
|
||||
|
||||
|
|
@ -89,4 +89,7 @@ buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr>
|
|||
.exe files). That is probably not usable for most NuttX targets.
|
||||
Instead, you should use this i486-elf-gcc to generate true ELF binaries
|
||||
under Cygwin.
|
||||
* Makefile - Alter copy arguements to avoid permissions problems when
|
||||
copying NuttX header files.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ $(NUTTX_DIR)/include/arch: $(NUTTX_DIR)
|
|||
$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include : $(STAGING_DIR) $(NUTTX_DIR)/include/arch
|
||||
@mkdir -p $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include || \
|
||||
{ echo "Failed to create $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include" ; exit 1 ; }
|
||||
@cp -a $(NUTTX_DIR)/include/* $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/. || \
|
||||
@cp -aLf $(NUTTX_DIR)/include/* $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/include/. || \
|
||||
{ echo "Failed to copy Nuttx header files" ; exit 1 ; }
|
||||
|
||||
$(TOOL_BUILD_DIR):
|
||||
|
|
|
|||
|
|
@ -1597,3 +1597,8 @@
|
|||
* examples/nsh and apps/nshlib - Move the core NuttShell (NSH) logic
|
||||
out of the exemples directory and into the apps/directory where
|
||||
it belongs.
|
||||
* apps/Makefile and configs/*/appconfig - Use '=' as the delimiter
|
||||
instead of '/' so that sub-directories in apps/ can be used.
|
||||
* apps/vsn - Move all VSN apps to apps/vsn.
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<tr align="center" bgcolor="#e4e4e4">
|
||||
<td>
|
||||
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
|
||||
<p>Last Updated: March 18, 2011</p>
|
||||
<p>Last Updated: March 19, 2011</p>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
@ -2248,6 +2248,8 @@ buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr>
|
|||
.exe files). That is probably not usable for most NuttX targets.
|
||||
Instead, you should use this i486-elf-gcc to generate true ELF binaries
|
||||
under Cygwin.
|
||||
* Makefile - Alter copy arguements to avoid permissions problems when
|
||||
copying NuttX header files.
|
||||
</pre></ul>
|
||||
|
||||
<table width ="100%">
|
||||
|
|
|
|||
|
|
@ -54,19 +54,19 @@ CONFIGURED_APPS += nshlib=.built_always
|
|||
# Individual selection of built-in applications:
|
||||
|
||||
# Hello world provide a simple skeleton/demo application
|
||||
CONFIGURED_APPS += hello=.built_always
|
||||
CONFIGURED_APPS += vsn/hello=.built_always
|
||||
|
||||
# Provide poweroff command to switch off the board
|
||||
CONFIGURED_APPS += poweroff=.built_always
|
||||
CONFIGURED_APPS += vsn/poweroff=.built_always
|
||||
|
||||
# Provide SDcard tool
|
||||
CONFIGURED_APPS += sdcard=.built_always
|
||||
CONFIGURED_APPS += vsn/sdcard=.built_always
|
||||
|
||||
# Provide RAMTRON tool
|
||||
CONFIGURED_APPS += ramtron=.built_always
|
||||
CONFIGURED_APPS += vsn/ramtron=.built_always
|
||||
|
||||
# Provide UNIX style free
|
||||
CONFIGURED_APPS += free=.built_always
|
||||
CONFIGURED_APPS += vsn/free=.built_always
|
||||
|
||||
# Provide JAVA Virtual Machine (the Darjeeling JVM)
|
||||
#CONFIGURED_APPS += jvm=.built_always
|
||||
#CONFIGURED_APPS += vsn/jvm=.built_always
|
||||
|
|
|
|||
Loading…
Reference in New Issue