diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-14 17:28:21 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-14 17:28:21 +0000 |
| commit | c8240be02d71629918b38fe85f9071e5f76a2dc5 (patch) | |
| tree | 24b52ad859812188f943f7a4064e9bcbad629c58 | |
| parent | c3eb9c41f6de5de3b7440806ce551dc329f0feaa (diff) | |
| download | nuttx-c8240be02d71629918b38fe85f9071e5f76a2dc5.tar.gz nuttx-c8240be02d71629918b38fe85f9071e5f76a2dc5.tar.bz2 nuttx-c8240be02d71629918b38fe85f9071e5f76a2dc5.zip | |
More version-related fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3504 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Makefile | 1 | ||||
| -rwxr-xr-x | nuttx/tools/configure.sh | 6 | ||||
| -rwxr-xr-x | nuttx/tools/zipme.sh | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index cb16bd597..f7e85369f 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -258,6 +258,7 @@ $(TOPDIR)/.version: @if [ ! -f .version ]; then \ echo "No .version file found, creating one"; \ tools/version.sh -v 0.0 -b 0 .version; \ + chmod 755 .version; \ fi # Create the include/nuttx/version.h file diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh index a4e74d4ee..0103716a0 100755 --- a/nuttx/tools/configure.sh +++ b/nuttx/tools/configure.sh @@ -121,7 +121,7 @@ if [ -z "${appdir}" ]; then # Check for a version file - unset CONFIG_NUTTX_VERSION + unset CONFIG_VERSION_STRING if [ -x "${TOPDIR}/.version" ]; then source "${TOPDIR}/.version" fi @@ -134,8 +134,8 @@ if [ -z "${appdir}" ]; then else # Check for a versioned apps/ directory - if [ -d "${TOPDIR}/../apps-${CONFIG_NUTTX_VERSION}" ]; then - appdir="../apps-${CONFIG_NUTTX_VERSION}" + if [ -d "${TOPDIR}/../apps-${CONFIG_VERSION_STRING}" ]; then + appdir="../apps-${CONFIG_VERSION_STRING}" fi fi fi diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh index 1bf09f198..cc7efb6ed 100755 --- a/nuttx/tools/zipme.sh +++ b/nuttx/tools/zipme.sh @@ -124,6 +124,7 @@ if [ ! -x "${VERSIONSH}" ]; then fi ${VERSIONSH} -v ${VERSION} ${NUTTX}/.version || \ { echo "${VERSIONSH} failed"; cat ${NUTTX}/.version; exit 1; } +chmod 755 ${NUTTX}/.version # Perform a full clean for the distribution |