Use = instead of / for delimiter in appconfig files

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3396 42af7a65-404d-4744-a932-0658087f49c3

25 files changed, 47 insertions, 38 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 11d06217b..b9a067c26 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -62,15 +62,15 @@ CONFIGURED_APPS =
 AVAILABLE_APPS =
 
 define ADD_AVAILABLE
-AVAILABLE_APPS += ${shell DIR=`echo $1 | cut -d'/' -f1`; if [ -r $$DIR/Makefile ]; then echo "$1"; fi}
+AVAILABLE_APPS += ${shell DIR=`echo $1 | cut -d'=' -f1`; if [ -r $$DIR/Makefile ]; then echo "$1"; fi}
 endef
 
 define BUILTIN_ADD_APP
-BUILTIN_APPS_DIR += ${shell echo $1 | cut -d'/' -f1}
+BUILTIN_APPS_DIR += ${shell echo $1 | cut -d'=' -f1}
 endef
 
 define BUILTIN_ADD_BUILT
-BUILTIN_APPS_BUILT += $1
+BUILTIN_APPS_BUILT += ${shell echo $1 | sed -e "s:=:/:g"}
 endef
 
 # (1) Create the list of available applications (AVAILABLE_APPS), (2) Add each
@@ -135,7 +135,7 @@ clean:
 	$(call CLEAN)
 
 distclean: clean
-	@rm -r .config
+	@rm -f .config
 	@rm -f Make.dep .depend
 	@rm -f exec_nuttapp_list.h
 	@rm -f exec_nuttapp_proto.h
diff --git a/nuttx/Makefile b/nuttx/Makefile
index 1e180b142..8e875cf64 100644
--- a/nuttx/Makefile
+++ b/nuttx/Makefile
@@ -65,7 +65,7 @@ BOARD_DIR	= configs/$(CONFIG_ARCH_BOARD)
 # APPS_LOC can be over-ridden from the command line:
 
 ifeq ($(CONFIG_BUILTIN_APPS),y)
-ifeq ($(APP_LOC),)
+ifeq ($(APPS_LOC),)
 APPS_LOC	= ../apps
 endif
 APPS_DIR	:= ${shell if [ -r $(APPS_LOC)/Makefile ]; then echo "$(APPS_LOC)"; fi}
diff --git a/nuttx/configs/avr32dev1/nsh/appconfig b/nuttx/configs/avr32dev1/nsh/appconfig
index a34eda375..d1701eff2 100644
--- a/nuttx/configs/avr32dev1/nsh/appconfig
+++ b/nuttx/configs/avr32dev1/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/detron/nsh/appconfig b/nuttx/configs/detron/nsh/appconfig
index 57fd74915..7abe0c6ed 100644
--- a/nuttx/configs/detron/nsh/appconfig
+++ b/nuttx/configs/detron/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/ea3131/nsh/appconfig b/nuttx/configs/ea3131/nsh/appconfig
index 878ce1853..85f04b727 100644
--- a/nuttx/configs/ea3131/nsh/appconfig
+++ b/nuttx/configs/ea3131/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/eagle100/nsh/appconfig b/nuttx/configs/eagle100/nsh/appconfig
index 97028d4c3..91ae18de2 100644
--- a/nuttx/configs/eagle100/nsh/appconfig
+++ b/nuttx/configs/eagle100/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/ez80f910200zco/nsh/appconfig b/nuttx/configs/ez80f910200zco/nsh/appconfig
index db733c0ba..80161aac8 100644
--- a/nuttx/configs/ez80f910200zco/nsh/appconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/lm3s6965-ek/nsh/appconfig b/nuttx/configs/lm3s6965-ek/nsh/appconfig
index d4f8c3ad6..8c0158df0 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/appconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/lm3s8962-ek/nsh/appconfig b/nuttx/configs/lm3s8962-ek/nsh/appconfig
index 4c5c6d157..723d429ac 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/appconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/mbed/nsh/appconfig b/nuttx/configs/mbed/nsh/appconfig
index 3563dcc63..f06086b59 100644
--- a/nuttx/configs/mbed/nsh/appconfig
+++ b/nuttx/configs/mbed/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/appconfig b/nuttx/configs/mcu123-lpc214x/nsh/appconfig
index 439fa9c7f..a0d5aadb2 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/appconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/ntosd-dm320/nsh/appconfig b/nuttx/configs/ntosd-dm320/nsh/appconfig
index f43f12058..4378bc7b1 100644
--- a/nuttx/configs/ntosd-dm320/nsh/appconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/nucleus2g/nsh/appconfig b/nuttx/configs/nucleus2g/nsh/appconfig
index 7c6dd08f8..2a369b8ab 100644
--- a/nuttx/configs/nucleus2g/nsh/appconfig
+++ b/nuttx/configs/nucleus2g/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
index 58b0c3b53..64bdcee3f 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/olimex-lpc2378/nsh/appconfig b/nuttx/configs/olimex-lpc2378/nsh/appconfig
index 21d8d346e..13b19fd1a 100644
--- a/nuttx/configs/olimex-lpc2378/nsh/appconfig
+++ b/nuttx/configs/olimex-lpc2378/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/olimex-strp711/nsh/appconfig b/nuttx/configs/olimex-strp711/nsh/appconfig
index b8fc1d238..b988f2098 100644
--- a/nuttx/configs/olimex-strp711/nsh/appconfig
+++ b/nuttx/configs/olimex-strp711/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/qemu-i486/nsh/appconfig b/nuttx/configs/qemu-i486/nsh/appconfig
index 6ad247659..1e0507ce8 100644
--- a/nuttx/configs/qemu-i486/nsh/appconfig
+++ b/nuttx/configs/qemu-i486/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/sam3u-ek/nsh/appconfig b/nuttx/configs/sam3u-ek/nsh/appconfig
index 2ce871372..68384b897 100644
--- a/nuttx/configs/sam3u-ek/nsh/appconfig
+++ b/nuttx/configs/sam3u-ek/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/sim/nsh/appconfig b/nuttx/configs/sim/nsh/appconfig
index 6e5816518..01e99d219 100644
--- a/nuttx/configs/sim/nsh/appconfig
+++ b/nuttx/configs/sim/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/stm3210e-eval/nsh/appconfig b/nuttx/configs/stm3210e-eval/nsh/appconfig
index 2b6c43302..d26c51dc7 100644
--- a/nuttx/configs/stm3210e-eval/nsh/appconfig
+++ b/nuttx/configs/stm3210e-eval/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/us7032evb1/nsh/appconfig b/nuttx/configs/us7032evb1/nsh/appconfig
index b3d0be81a..ca3b04385 100644
--- a/nuttx/configs/us7032evb1/nsh/appconfig
+++ b/nuttx/configs/us7032evb1/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig
index 65e8c220f..0d7fd27f4 100755
--- a/nuttx/configs/vsn/nsh/appconfig
+++ b/nuttx/configs/vsn/nsh/appconfig
@@ -49,24 +49,24 @@
 #CONFIG_BUILTIN_APP_START="hello"
 
 # Application Libraries
-CONFIGURED_APPS += nshlib/.built_always
+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 += hello=.built_always
 
 # Provide poweroff command to switch off the board
-CONFIGURED_APPS += poweroff/.built_always 
+CONFIGURED_APPS += poweroff=.built_always 
 
 # Provide SDcard tool
-CONFIGURED_APPS += sdcard/.built_always 
+CONFIGURED_APPS += sdcard=.built_always 
 
 # Provide RAMTRON tool
-CONFIGURED_APPS += ramtron/.built_always 
+CONFIGURED_APPS += ramtron=.built_always 
 
 # Provide UNIX style free 
-CONFIGURED_APPS += free/.built_always 
+CONFIGURED_APPS += free=.built_always 
 
 # Provide JAVA Virtual Machine (the Darjeeling JVM)
-#CONFIGURED_APPS += jvm/.built_always 
+#CONFIGURED_APPS += jvm=.built_always 
diff --git a/nuttx/configs/xtrs/nsh/appconfig b/nuttx/configs/xtrs/nsh/appconfig
index 7325820e9..223d55423 100644
--- a/nuttx/configs/xtrs/nsh/appconfig
+++ b/nuttx/configs/xtrs/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/configs/z80sim/nsh/appconfig b/nuttx/configs/z80sim/nsh/appconfig
index acd2aa82d..229d3a548 100644
--- a/nuttx/configs/z80sim/nsh/appconfig
+++ b/nuttx/configs/z80sim/nsh/appconfig
@@ -33,4 +33,4 @@
 #

 ############################################################################

 

-CONFIGURED_APPS += nshlib/.built_always
\ No newline at end of file
+CONFIGURED_APPS += nshlib=.built_always
\ No newline at end of file
diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index a68561d82..e20b1cf6b 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configure.sh
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,16 @@
 
 WD=`pwd`
 TOPDIR="${WD}/.."
-USAGE="${0} [-d] [-a <app-dir>] <board-name>"
+USAGE="
+
+USAGE: ${0} [-d] [-a <app-dir>] <board-name>/<config-name>
+
+Where:
+  <board-name> is the name of the board in the configs directory
+  <config-name> is the name of the board configuration sub-directory
+  <add-dir> is the path to the apps/ directory, relative to the nuttx directory
+
+"
 
 # Parse command arguments
 
@@ -47,7 +56,7 @@ while [ ! -z "$1" ]; do
       set -x
       ;;
     -h )
-      echo "$usage"
+      echo "$USAGE"
       exit 0
       ;;
     -a )
@@ -110,7 +119,7 @@ fi
 
 if [ -z "${appdir}" ]; then
   if [ -d "${TOPDIR}/../apps" ]; then
-    appdir="${TOPDIR}/../apps"
+    appdir="../apps"
   fi
 fi
 
@@ -130,7 +139,7 @@ if [ ! -z "${appdir}" ]; then
   if [ ! -r "${configpath}/appconfig" ]; then
     echo "NOTE: No readable appconfig file found in ${configpath}"
   else
-    cp -f "${configpath}/appconfig" "${appdir}/.config" || \
+    cp -f "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \
       { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
 
     echo "" >> "${TOPDIR}/.config"