diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 22:07:56 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 22:07:56 +0000 |
commit | 60051cba0cf424e01ef2eda09816ee8945867b6d (patch) | |
tree | 506ffc7c368b1b0756a12099b0f2401e56ea4496 /nuttx | |
parent | f6f8f750c7a25d123dc6f20902b38bcda1c95963 (diff) | |
download | px4-nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.tar.gz px4-nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.tar.bz2 px4-nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.zip |
More build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3407 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Makefile | 2 | ||||
-rwxr-xr-x | nuttx/tools/configure.sh | 17 | ||||
-rwxr-xr-x | nuttx/tools/zipme.sh | 10 |
3 files changed, 25 insertions, 4 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 9c20f4f26..b5c4dd6ae 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -349,7 +349,7 @@ endif download: $(BIN) $(call DOWNLOAD, $<) -depend: +depend: context @for dir in $(MAKEDIRS) ; do \ $(MAKE) -C $$dir TOPDIR="$(TOPDIR)" depend ; \ done diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh index ad82b457e..8e56c2a0e 100755 --- a/nuttx/tools/configure.sh +++ b/nuttx/tools/configure.sh @@ -118,8 +118,25 @@ fi # Check for the apps/ dir in the usual place if appdir was not provided if [ -z "${appdir}" ]; then + + # Check for a version file + + unset CONFIG_NUTTX_VERSION + if [ -x "${TOPDIR}/.version" ]; then + source "${TOPDIR}/.version" + fi + + # Check for an unversioned apps/ directory + if [ -d "${TOPDIR}/../apps" ]; then appdir="../apps" + + else + # Check for a versioned apps/ directory + + if [ -d "${TOPDIR}/../apps-${CONFIG_NUTTX_VERSION}" ]; then + appdir="../apps-${CONFIG_NUTTX_VERSION}" + fi fi fi diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh index 7c08bd271..bf8041a4f 100755 --- a/nuttx/tools/zipme.sh +++ b/nuttx/tools/zipme.sh @@ -132,11 +132,15 @@ if [ -f ${ZIP_NAME} ] ; then { echo "rm ${ZIP_NAME} failed!" ; exit 1 ; } fi -# Write a version file +# Write a version file. The syntax of file is such that it may be sourced +# by a bash script or included by a Makefile -echo "CONFIG_NUTTX_VERSION=\"${VERSION}\" >${NUTTX}/.version +echo "#!/bin/bash" >${NUTTX}/.version +echo "" >>${NUTTX}/.version +echo "CONFIG_NUTTX_VERSION=\"${VERSION}\" >>${NUTTX}/.version +chmod 755 ${NUTTX}/.version -# Then zip it +# Then zip-up the directories ${TAR} ${TAR_NAME} nuttx-${VERSION}/nuttx nuttx-${VERSION}/apps || \ { echo "tar of ${TAR_NAME} failed!" ; exit 1 ; } |