forked from nuttx/nuttx-update
More version-related fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3504 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
parent
b27d449403
commit
f32009d446
3 changed files with 5 additions and 3 deletions
1
Makefile
1
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue