Correct name of another uClibc++ directory

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5288 42af7a65-404d-4744-a932-0658087f49c3

46 files changed, 95 insertions, 1 deletions

diff --git a/misc/uClibc++/install.sh b/misc/uClibc++/install.sh
index 3a2bb66f2..065738e1a 100755
--- a/misc/uClibc++/install.sh
+++ b/misc/uClibc++/install.sh
@@ -217,7 +217,7 @@ if [ ! -d "${nuttx_path}" ]; then
 fi
 
 if [ ! -f "${nuttx_path}/Makefile" ]; then
-  echo "ERROR: Not Makefile in directory ${nuttx_path}"
+  echo "ERROR: No Makefile in directory ${nuttx_path}"
   echo $usage
   exit 1
 fi
diff --git a/misc/uClibc++/libxx/uClib++/Make.defs b/misc/uClibc++/libxx/uClibc++/Make.defs
index 38ae24a93..38ae24a93 100644
--- a/misc/uClibc++/libxx/uClib++/Make.defs
+++ b/misc/uClibc++/libxx/uClibc++/Make.defs
diff --git a/misc/uClibc++/libxx/uClib++/algorithm.cxx b/misc/uClibc++/libxx/uClibc++/algorithm.cxx
index e21b14e3f..e21b14e3f 100644
--- a/misc/uClibc++/libxx/uClib++/algorithm.cxx
+++ b/misc/uClibc++/libxx/uClibc++/algorithm.cxx
diff --git a/misc/uClibc++/libxx/uClib++/associative_base.cxx b/misc/uClibc++/libxx/uClibc++/associative_base.cxx
index cc2d20e54..cc2d20e54 100644
--- a/misc/uClibc++/libxx/uClib++/associative_base.cxx
+++ b/misc/uClibc++/libxx/uClibc++/associative_base.cxx
diff --git a/misc/uClibc++/libxx/uClib++/bitset.cxx b/misc/uClibc++/libxx/uClibc++/bitset.cxx
index f1ece31f9..f1ece31f9 100644
--- a/misc/uClibc++/libxx/uClib++/bitset.cxx
+++ b/misc/uClibc++/libxx/uClibc++/bitset.cxx
diff --git a/misc/uClibc++/libxx/uClib++/char_traits.cxx b/misc/uClibc++/libxx/uClibc++/char_traits.cxx
index 2a91bd97f..2a91bd97f 100644
--- a/misc/uClibc++/libxx/uClib++/char_traits.cxx
+++ b/misc/uClibc++/libxx/uClibc++/char_traits.cxx
diff --git a/misc/uClibc++/libxx/uClib++/complex.cxx b/misc/uClibc++/libxx/uClibc++/complex.cxx
index 6b895a888..6b895a888 100644
--- a/misc/uClibc++/libxx/uClib++/complex.cxx
+++ b/misc/uClibc++/libxx/uClibc++/complex.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_op.cxx b/misc/uClibc++/libxx/uClibc++/del_op.cxx
index f5a36957d..f5a36957d 100644
--- a/misc/uClibc++/libxx/uClib++/del_op.cxx
+++ b/misc/uClibc++/libxx/uClibc++/del_op.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opnt.cxx b/misc/uClibc++/libxx/uClibc++/del_opnt.cxx
index 96cb03baa..96cb03baa 100644
--- a/misc/uClibc++/libxx/uClib++/del_opnt.cxx
+++ b/misc/uClibc++/libxx/uClibc++/del_opnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opv.cxx b/misc/uClibc++/libxx/uClibc++/del_opv.cxx
index 028e86f36..028e86f36 100644
--- a/misc/uClibc++/libxx/uClib++/del_opv.cxx
+++ b/misc/uClibc++/libxx/uClibc++/del_opv.cxx
diff --git a/misc/uClibc++/libxx/uClib++/del_opvnt.cxx b/misc/uClibc++/libxx/uClibc++/del_opvnt.cxx
index f2a2a361c..f2a2a361c 100644
--- a/misc/uClibc++/libxx/uClib++/del_opvnt.cxx
+++ b/misc/uClibc++/libxx/uClibc++/del_opvnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/deque.cxx b/misc/uClibc++/libxx/uClibc++/deque.cxx
index c5155808b..c5155808b 100644
--- a/misc/uClibc++/libxx/uClib++/deque.cxx
+++ b/misc/uClibc++/libxx/uClibc++/deque.cxx
diff --git a/misc/uClibc++/libxx/uClib++/eh_alloc.cxx b/misc/uClibc++/libxx/uClibc++/eh_alloc.cxx
index 5098196d8..5098196d8 100644
--- a/misc/uClibc++/libxx/uClib++/eh_alloc.cxx
+++ b/misc/uClibc++/libxx/uClibc++/eh_alloc.cxx
diff --git a/misc/uClibc++/libxx/uClib++/eh_globals.cxx b/misc/uClibc++/libxx/uClibc++/eh_globals.cxx
index 38d4583e6..38d4583e6 100644
--- a/misc/uClibc++/libxx/uClib++/eh_globals.cxx
+++ b/misc/uClibc++/libxx/uClibc++/eh_globals.cxx
diff --git a/misc/uClibc++/libxx/uClib++/exception.cxx b/misc/uClibc++/libxx/uClibc++/exception.cxx
index 82021ddb6..82021ddb6 100644
--- a/misc/uClibc++/libxx/uClib++/exception.cxx
+++ b/misc/uClibc++/libxx/uClibc++/exception.cxx
diff --git a/misc/uClibc++/libxx/uClib++/fstream.cxx b/misc/uClibc++/libxx/uClibc++/fstream.cxx
index 535fe9a52..535fe9a52 100644
--- a/misc/uClibc++/libxx/uClib++/fstream.cxx
+++ b/misc/uClibc++/libxx/uClibc++/fstream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/func_exception.cxx b/misc/uClibc++/libxx/uClibc++/func_exception.cxx
index fab095f3d..fab095f3d 100644
--- a/misc/uClibc++/libxx/uClib++/func_exception.cxx
+++ b/misc/uClibc++/libxx/uClibc++/func_exception.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iomanip.cxx b/misc/uClibc++/libxx/uClibc++/iomanip.cxx
index c5e60ccea..c5e60ccea 100644
--- a/misc/uClibc++/libxx/uClib++/iomanip.cxx
+++ b/misc/uClibc++/libxx/uClibc++/iomanip.cxx
diff --git a/misc/uClibc++/libxx/uClib++/ios.cxx b/misc/uClibc++/libxx/uClibc++/ios.cxx
index 3b85d5be2..3b85d5be2 100644
--- a/misc/uClibc++/libxx/uClib++/ios.cxx
+++ b/misc/uClibc++/libxx/uClibc++/ios.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iostream.cxx b/misc/uClibc++/libxx/uClibc++/iostream.cxx
index 7a190a2bf..7a190a2bf 100644
--- a/misc/uClibc++/libxx/uClib++/iostream.cxx
+++ b/misc/uClibc++/libxx/uClibc++/iostream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/istream.cxx b/misc/uClibc++/libxx/uClibc++/istream.cxx
index 9e9613973..9e9613973 100644
--- a/misc/uClibc++/libxx/uClib++/istream.cxx
+++ b/misc/uClibc++/libxx/uClibc++/istream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/iterator.cxx b/misc/uClibc++/libxx/uClibc++/iterator.cxx
index 2e21517a2..2e21517a2 100644
--- a/misc/uClibc++/libxx/uClib++/iterator.cxx
+++ b/misc/uClibc++/libxx/uClibc++/iterator.cxx
diff --git a/misc/uClibc++/libxx/uClib++/limits.cxx b/misc/uClibc++/libxx/uClibc++/limits.cxx
index 0fd42d577..0fd42d577 100644
--- a/misc/uClibc++/libxx/uClib++/limits.cxx
+++ b/misc/uClibc++/libxx/uClibc++/limits.cxx
diff --git a/misc/uClibc++/libxx/uClib++/list.cxx b/misc/uClibc++/libxx/uClibc++/list.cxx
index cfc44e079..cfc44e079 100644
--- a/misc/uClibc++/libxx/uClib++/list.cxx
+++ b/misc/uClibc++/libxx/uClibc++/list.cxx
diff --git a/misc/uClibc++/libxx/uClib++/locale.cxx b/misc/uClibc++/libxx/uClibc++/locale.cxx
index bc41792df..bc41792df 100644
--- a/misc/uClibc++/libxx/uClib++/locale.cxx
+++ b/misc/uClibc++/libxx/uClibc++/locale.cxx
diff --git a/misc/uClibc++/libxx/uClib++/map.cxx b/misc/uClibc++/libxx/uClibc++/map.cxx
index 06e56a0bb..06e56a0bb 100644
--- a/misc/uClibc++/libxx/uClib++/map.cxx
+++ b/misc/uClibc++/libxx/uClibc++/map.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_handler.cxx b/misc/uClibc++/libxx/uClibc++/new_handler.cxx
index 1d85ee3fa..1d85ee3fa 100644
--- a/misc/uClibc++/libxx/uClib++/new_handler.cxx
+++ b/misc/uClibc++/libxx/uClibc++/new_handler.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_op.cxx b/misc/uClibc++/libxx/uClibc++/new_op.cxx
index 764eb835c..764eb835c 100644
--- a/misc/uClibc++/libxx/uClib++/new_op.cxx
+++ b/misc/uClibc++/libxx/uClibc++/new_op.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opnt.cxx b/misc/uClibc++/libxx/uClibc++/new_opnt.cxx
index cffce610b..cffce610b 100644
--- a/misc/uClibc++/libxx/uClib++/new_opnt.cxx
+++ b/misc/uClibc++/libxx/uClibc++/new_opnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opv.cxx b/misc/uClibc++/libxx/uClibc++/new_opv.cxx
index ef416e07b..ef416e07b 100644
--- a/misc/uClibc++/libxx/uClib++/new_opv.cxx
+++ b/misc/uClibc++/libxx/uClibc++/new_opv.cxx
diff --git a/misc/uClibc++/libxx/uClib++/new_opvnt.cxx b/misc/uClibc++/libxx/uClibc++/new_opvnt.cxx
index 3ea592afb..3ea592afb 100644
--- a/misc/uClibc++/libxx/uClib++/new_opvnt.cxx
+++ b/misc/uClibc++/libxx/uClibc++/new_opvnt.cxx
diff --git a/misc/uClibc++/libxx/uClib++/numeric.cxx b/misc/uClibc++/libxx/uClibc++/numeric.cxx
index eb93f2eb7..eb93f2eb7 100644
--- a/misc/uClibc++/libxx/uClib++/numeric.cxx
+++ b/misc/uClibc++/libxx/uClibc++/numeric.cxx
diff --git a/misc/uClibc++/libxx/uClib++/ostream.cxx b/misc/uClibc++/libxx/uClibc++/ostream.cxx
index 0973871b0..0973871b0 100644
--- a/misc/uClibc++/libxx/uClib++/ostream.cxx
+++ b/misc/uClibc++/libxx/uClibc++/ostream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/queue.cxx b/misc/uClibc++/libxx/uClibc++/queue.cxx
index 356efeb13..356efeb13 100644
--- a/misc/uClibc++/libxx/uClib++/queue.cxx
+++ b/misc/uClibc++/libxx/uClibc++/queue.cxx
diff --git a/misc/uClibc++/libxx/uClib++/set.cxx b/misc/uClibc++/libxx/uClibc++/set.cxx
index 61ec56a71..61ec56a71 100644
--- a/misc/uClibc++/libxx/uClib++/set.cxx
+++ b/misc/uClibc++/libxx/uClibc++/set.cxx
diff --git a/misc/uClibc++/libxx/uClib++/sstream.cxx b/misc/uClibc++/libxx/uClibc++/sstream.cxx
index e712b6764..e712b6764 100644
--- a/misc/uClibc++/libxx/uClib++/sstream.cxx
+++ b/misc/uClibc++/libxx/uClibc++/sstream.cxx
diff --git a/misc/uClibc++/libxx/uClib++/stack.cxx b/misc/uClibc++/libxx/uClibc++/stack.cxx
index 53a21bba5..53a21bba5 100644
--- a/misc/uClibc++/libxx/uClib++/stack.cxx
+++ b/misc/uClibc++/libxx/uClibc++/stack.cxx
diff --git a/misc/uClibc++/libxx/uClib++/stdexcept.cxx b/misc/uClibc++/libxx/uClibc++/stdexcept.cxx
index 90dccc7a4..90dccc7a4 100644
--- a/misc/uClibc++/libxx/uClib++/stdexcept.cxx
+++ b/misc/uClibc++/libxx/uClibc++/stdexcept.cxx
diff --git a/misc/uClibc++/libxx/uClib++/streambuf.cxx b/misc/uClibc++/libxx/uClibc++/streambuf.cxx
index 541732459..541732459 100644
--- a/misc/uClibc++/libxx/uClib++/streambuf.cxx
+++ b/misc/uClibc++/libxx/uClibc++/streambuf.cxx
diff --git a/misc/uClibc++/libxx/uClib++/string.cxx b/misc/uClibc++/libxx/uClibc++/string.cxx
index 1edf69b5d..1edf69b5d 100644
--- a/misc/uClibc++/libxx/uClib++/string.cxx
+++ b/misc/uClibc++/libxx/uClibc++/string.cxx
diff --git a/misc/uClibc++/libxx/uClib++/support.cxx b/misc/uClibc++/libxx/uClibc++/support.cxx
index 875459442..875459442 100644
--- a/misc/uClibc++/libxx/uClib++/support.cxx
+++ b/misc/uClibc++/libxx/uClibc++/support.cxx
diff --git a/misc/uClibc++/libxx/uClib++/typeinfo.cxx b/misc/uClibc++/libxx/uClibc++/typeinfo.cxx
index b8ea30197..b8ea30197 100644
--- a/misc/uClibc++/libxx/uClib++/typeinfo.cxx
+++ b/misc/uClibc++/libxx/uClibc++/typeinfo.cxx
diff --git a/misc/uClibc++/libxx/uClib++/utility.cxx b/misc/uClibc++/libxx/uClibc++/utility.cxx
index b2f8995d7..b2f8995d7 100644
--- a/misc/uClibc++/libxx/uClib++/utility.cxx
+++ b/misc/uClibc++/libxx/uClibc++/utility.cxx
diff --git a/misc/uClibc++/libxx/uClib++/valarray.cxx b/misc/uClibc++/libxx/uClibc++/valarray.cxx
index e4bd504cf..e4bd504cf 100644
--- a/misc/uClibc++/libxx/uClib++/valarray.cxx
+++ b/misc/uClibc++/libxx/uClibc++/valarray.cxx
diff --git a/misc/uClibc++/libxx/uClib++/vector.cxx b/misc/uClibc++/libxx/uClibc++/vector.cxx
index 5ee0de188..5ee0de188 100644
--- a/misc/uClibc++/libxx/uClib++/vector.cxx
+++ b/misc/uClibc++/libxx/uClibc++/vector.cxx
diff --git a/misc/uClibc++/uninstall.sh b/misc/uClibc++/uninstall.sh
new file mode 100755
index 000000000..ae7344449
--- /dev/null
+++ b/misc/uClibc++/uninstall.sh
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+usage="USAGE: $0 <full path to the NuttX directory>"
+special="include/features.h"
+
+# Get the single, required command line argument
+
+nuttx_path=$1
+if [ -z "${nuttx_path}" ]; then
+  echo "ERROR: Missing path to the NuttX directory"
+  echo $usage
+  exit 1
+fi
+
+# Lots of sanity checking so that we do not do anything too stupid
+
+if [ ! -d libxx ]; then
+  echo "ERROR: Directory libxx does not exist in this directory"
+  echo "       Please CD into the misc/uClibc++ directory and try again"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -d include ]; then
+  echo "ERROR: Directory include does not exist in this directory"
+  echo "       Please CD into the misc/uClibc++ directory and try again"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -d "${nuttx_path}" ]; then
+  echo "ERROR: Directory ${nuttx_path} does not exist"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -f "${nuttx_path}/Makefile" ]; then
+  echo "ERROR: No Makefile in directory ${nuttx_path}"
+  echo $usage
+  exit 1
+fi
+
+libxx_srcdir=${nuttx_path}/libxx
+
+if [ ! -d "${libxx_srcdir}" ]; then
+  echo "ERROR: Directory ${libxx_srcdir} does not exist"
+  echo $usage
+  exit 1
+fi
+
+if [ ! -f "${libxx_srcdir}/Makefile" ]; then
+  echo "ERROR: No Makefile in directory ${libxx_srcdir}"
+  echo $usage
+  exit 1
+fi
+
+uclibc_srcdir=${libxx_srcdir}/uClibc++
+
+if [ ! -d "${uclibc_srcdir}" ]; then
+  echo "ERROR: Directory ${uclibc_srcdir} already exists"
+  echo "       uClibc++ is not installed"
+  exit 0
+fi
+
+nuttx_incdir=${nuttx_path}/include
+
+if [ ! -d "${nuttx_incdir}" ]; then
+  echo "ERROR: Directory ${nuttx_incdir} does not exist"
+  echo $usage
+  exit 1
+fi
+
+uclibc_incdir=${nuttx_incdir}/uClibc++
+
+if [ ! -d "${uclibc_incdir}" ]; then
+  echo "ERROR: Directory ${uclibc_incdir} does not exist"
+  echo "       uClibc++ is only partially installed"
+fi
+
+echo "Removing uClibc++ in the NuttX source tree"
+
+rm -rf ${uclibc_incdir} || \
+  { echo "ERROR: 'rm -rf ${uclibc_incdir}' failed"; exit 1; }
+
+rm -rf ${uclibc_srcdir} || \
+  { echo "ERROR: 'rm -rf ${libxx_srcdir}' failed"; exit 1; }
+
+for file in $special; do
+  rm -f ${nuttx_path}/${special} || \
+    { echo "ERROR: ' rm -f ${nuttx_path}/${special}' failed"; exit 1; }
+done
+
+echo "Successfully uninstalled"
+echo ""