nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

More version-related fixes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3504 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-04-14 17:28:21 +00:00
parent b27d449403
commit f32009d446
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -258,6 +258,7 @@ $(TOPDIR)/.version:
@if [ ! -f .version ]; then \ @if [ ! -f .version ]; then \
echo "No .version file found, creating one"; \ echo "No .version file found, creating one"; \
tools/version.sh -v 0.0 -b 0 .version; \ tools/version.sh -v 0.0 -b 0 .version; \
chmod 755 .version; \
fi fi
# Create the include/nuttx/version.h file # Create the include/nuttx/version.h file

6
tools/configure.sh
View file

@ -121,7 +121,7 @@ if [ -z "${appdir}" ]; then
# Check for a version file # Check for a version file
unset CONFIG_NUTTX_VERSION unset CONFIG_VERSION_STRING
if [ -x "${TOPDIR}/.version" ]; then if [ -x "${TOPDIR}/.version" ]; then
source "${TOPDIR}/.version" source "${TOPDIR}/.version"
fi fi
@ -134,8 +134,8 @@ if [ -z "${appdir}" ]; then
else else
# Check for a versioned apps/ directory # Check for a versioned apps/ directory
if [ -d "${TOPDIR}/../apps-${CONFIG_NUTTX_VERSION}" ]; then if [ -d "${TOPDIR}/../apps-${CONFIG_VERSION_STRING}" ]; then
appdir="../apps-${CONFIG_NUTTX_VERSION}" appdir="../apps-${CONFIG_VERSION_STRING}"
fi fi
fi fi
fi fi

1
tools/zipme.sh
View file

@ -124,6 +124,7 @@ if [ ! -x "${VERSIONSH}" ]; then
fi fi
${VERSIONSH} -v ${VERSION} ${NUTTX}/.version || \ ${VERSIONSH} -v ${VERSION} ${NUTTX}/.version || \
{ echo "${VERSIONSH} failed"; cat ${NUTTX}/.version; exit 1; } { echo "${VERSIONSH} failed"; cat ${NUTTX}/.version; exit 1; }
chmod 755 ${NUTTX}/.version
# Perform a full clean for the distribution # Perform a full clean for the distribution