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

Use = instead of / for delimiter in appconfig files

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3396 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-19 13:28:07 +00:00
parent 19fd3b0d48
commit e07f0db120
24 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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}

2
configs/avr32dev1/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/detron/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/ea3131/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/eagle100/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/ez80f910200zco/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/lm3s6965-ek/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/lm3s8962-ek/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/mbed/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/mcu123-lpc214x/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/ntosd-dm320/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/nucleus2g/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/olimex-lpc1766stk/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/olimex-lpc2378/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/olimex-strp711/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/qemu-i486/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/sam3u-ek/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/sim/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/stm3210e-eval/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/us7032evb1/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

14
configs/vsn/nsh/appconfig
View File

@ -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

2
configs/xtrs/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

2
configs/z80sim/nsh/appconfig
View File

@ -33,4 +33,4 @@
#
############################################################################
CONFIGURED_APPS += nshlib/.built_always
CONFIGURED_APPS += nshlib=.built_always

19
tools/configure.sh
View File

@ -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"