From b1bfef33b6a23dac5ed4c260464fd4251817c39f Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 10 Jun 2007 02:24:53 +0000 Subject: [PATCH] Force directory name to be nuttx-xx.yy.zz git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@284 7fd9a85b-ad96-42d3-883c-3090e2eb8679 --- nuttx/ChangeLog | 1 + nuttx/Documentation/NuttX.html | 1 + nuttx/TODO | 6 ++++-- nuttx/tools/zipme.sh | 22 +++++++++++++++++----- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 064a40dce..485db96b2 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -180,5 +180,6 @@ 0.2.8 2007-xx-xx Gregory Nutt * tools/Makefile.mkconfig: Under Cygwin, executable has a different name * tools/mkdeps.sh & arch/arm/src/Makefile: Corrected a problem makeing dependencies + * tools/zipme.sh: Force directory name to be nuttx-xx.yy.zz * Started m68322 diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 34bad5d7d..3d765a867 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -615,6 +615,7 @@ Other memory: * tools/Makefile.mkconfig: Under Cygwin, executable has a different name * tools/mkdeps.sh & arch/arm/src/Makefile: Corrected a problem makeing dependencies + * tools/zipme.sh: Force directory name to be nuttx-xx.yy.zz * Started m68322 diff --git a/nuttx/TODO b/nuttx/TODO index c05ec796b..64b9896fe 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -23,7 +23,7 @@ o Signals - 'Standard' signals and signal actions are not supported. o pthreads -- pthread_cancel(): Should implemenent cancellation points and pthread_testcancel() +- pthread_cancel(): Should implement cancellation points and pthread_testcancel() o C++ Support - Need to call static constructors @@ -33,12 +33,13 @@ o Network o USB - Implement USB device support +- Implement USB bulk device o Libraries - sscanf() and lib_vsprintf() do not support floating point values. o File system -- Add statfs(), chmod(), truncate(). +- Add chmod(), truncate(). - FAT32: long file names o Console Output @@ -79,3 +80,4 @@ o pjrc-8052 / MCS51 clock_initialize.c at line 107 pthread_create.c at 330 sighand.c at 225 and 244 + diff --git a/nuttx/tools/zipme.sh b/nuttx/tools/zipme.sh index 5919edddb..382305d68 100755 --- a/nuttx/tools/zipme.sh +++ b/nuttx/tools/zipme.sh @@ -35,7 +35,7 @@ #set -x WD=`pwd` -DATECODE=$1 +VERSION=$1 TAR="tar cvf" ZIP=gzip @@ -55,11 +55,14 @@ GARBAGEDIRS="\ # Make sure we know what is going on -if [ -z ${DATECODE} ] ; then +if [ -z ${VERSION} ] ; then echo "You must supply a version like xx.yy.zz as a parameter" exit 1; fi +# Find the directory we were executed from and were we expect to +# see the directory to tar up + MYNAME=`basename $0` if [ -x ${WD}/${MYNAME} ] ; then @@ -68,23 +71,32 @@ else if [ -x ${WD}/tools/${MYNAME} ] ; then NUTTX=${WD} else - echo "You must cd NUTTX directory to execute this script." + echo "You must cd into the NUTTX directory to execute this script." exit 1 fi fi +# Get the NuttX directory name and the path to the parent directory + NUTTXDIR=`basename ${NUTTX}` PROJECTS=`dirname ${NUTTX}` +# The name of the directory must match the version number + +if [ "X$NUTTXDIR" != "Xnuttx-${VERSION}" ]; then + echo "Expected directory name to be nuttx-${VERSION} found ${NUTTXDIR}" + exit 1 +fi + cd ${PROJECTS} || \ { echo "Failed to cd to ${PROJECTS}" ; exit 1 ; } if [ ! -d ${NUTTXDIR} ] ; then echo "${PROJECTS}/${NUTTXDIR} does not exist!" - exit 1; + exit 1 fi -TAR_NAME=nuttx-${DATECODE}.tar +TAR_NAME=nuttx-${VERSION}.tar ZIP_NAME=${TAR_NAME}.gz # Prepare the nuttx directory -- Remove editor garbage