diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-04-19 18:35:06 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-04-19 18:35:06 -0600 |
| commit | cce5af04eab27f136d48a5d06f5ac97b22e6b627 (patch) | |
| tree | ee0ba220bf6921fa4f2d7221dd991b5f8e782b56 /nuttx/tools | |
| parent | 2d32b627f6f91e9f70ea20a481adf91dd8d27e99 (diff) | |
| download | px4-nuttx-cce5af04eab27f136d48a5d06f5ac97b22e6b627.tar.gz px4-nuttx-cce5af04eab27f136d48a5d06f5ac97b22e6b627.tar.bz2 px4-nuttx-cce5af04eab27f136d48a5d06f5ac97b22e6b627.zip | |
Fix comments, references to the old SVN, and links to the old SVN. Replace with equivalent GIT info
Diffstat (limited to 'nuttx/tools')
| -rw-r--r-- | nuttx/tools/Makefile.host | 9 | ||||
| -rwxr-xr-x | nuttx/tools/mkexport.sh | 1 | ||||
| -rwxr-xr-x | nuttx/tools/version.sh | 12 |
3 files changed, 15 insertions, 7 deletions
diff --git a/nuttx/tools/Makefile.host b/nuttx/tools/Makefile.host index 998d38916..738e66ca1 100644 --- a/nuttx/tools/Makefile.host +++ b/nuttx/tools/Makefile.host @@ -107,6 +107,15 @@ ifdef HOSTEXEEXT cmpconfig: cmpconfig$(HOSTEXEEXT) endif +# kconfig2html - Create an HTML document describing the configuration options + +kconfig2html$(HOSTEXEEXT): kconfig2html.c + $(Q) $(HOSTCC) $(HOSTCFLAGS) -o kconfig2html$(HOSTEXEEXT) kconfig2html.c + +ifdef HOSTEXEEXT +kconfig2html: kconfig2html$(HOSTEXEEXT) +endif + # mkversion - Convert a .version file into a C version.h file mkversion$(HOSTEXEEXT): mkconfig.c cfgdefine.c diff --git a/nuttx/tools/mkexport.sh b/nuttx/tools/mkexport.sh index 7ddeae699..0c6b797dc 100755 --- a/nuttx/tools/mkexport.sh +++ b/nuttx/tools/mkexport.sh @@ -189,7 +189,6 @@ echo "ARCHCXXFLAGS = ${ARCHCXXFLAGS}" >>"${EXPORTDIR}/build/Make.defs" cp -LR -p "${TOPDIR}/include" "${EXPORTDIR}/." || \ { echo "MK: 'cp ${TOPDIR}/include' failed"; exit 1; } -find "${EXPORTDIR}/include" -name .svn | xargs rm -rf # Copy the startup object file(s) diff --git a/nuttx/tools/version.sh b/nuttx/tools/version.sh index d15adb186..fed9c00ff 100755 --- a/nuttx/tools/version.sh +++ b/nuttx/tools/version.sh @@ -109,17 +109,17 @@ if [ "X${MAJOR}" = "X${VERSION}" ]; then fi MINOR=`echo ${VERSION} | cut -d'.' -f2` -# Get SVN information (if not provided on the command line) +# Get GIT information (if not provided on the command line) if [ -z "${BUILD}" ]; then - SVNINFO=`svn info 2>/dev/null | fgrep 'Revision:'` - if [ -z "${SVNINFO}" ]; then - echo "SVN version information is not available" + GITINFO=`git log 2>/dev/null | head 1` + if [ -z "${GITINFO}" ]; then + echo "GIT version information is not available" exit 3 fi - BUILD=`echo ${SVNINFO} | cut -d' ' -f2` + BUILD=`echo ${GITINFO} | cut -d' ' -f2` if [ -z "${BUILD}" ]; then - echo "SVN build information not found" + echo "GIT build information not found" exit 4 fi fi |