diff --git a/tools/testbuild.sh b/tools/testbuild.sh index a57d4ae4050..9d008ce48a7 100755 --- a/tools/testbuild.sh +++ b/tools/testbuild.sh @@ -42,7 +42,6 @@ host=linux wenv=cygwin sizet=uint APPSDIR=../apps -NXWDIR=../NxWidgets MAKE_FLAGS=-i MAKE=make unset testfile @@ -59,7 +58,6 @@ function showusage { echo " -s Use C++ unsigned long size_t in new operator. Default unsigned int" echo " -a provides the relative path to the apps/ directory. Default ../apps" echo " -t provides the absolute path to top nuttx/ directory. Default $PWD/../nuttx" - echo " -n provides the relative path to the NxWidgets/ directory. Default ../NxWidgets" echo " -d enables script debug output" echo " -x exit on build failures" echo " -h will show this help test and terminate" @@ -112,10 +110,6 @@ while [ ! -z "$1" ]; do shift nuttx="$1" ;; - -n ) - shift - NXWDIR="$1" - ;; -h ) showusage ;; @@ -240,40 +234,6 @@ function configure { ${MAKE} ${MAKE_FLAGS} olddefconfig 1>/dev/null 2>&1 } -# Build the NxWidgets libraries - -function nxbuild { - if [ -e $APPSDIR/external ]; then - $UNLINK $APPSDIR/external - fi - - unset nxconfig - if [ -d $NXWDIR ]; then - nxconfig=`grep CONFIG_NXWM=y $nuttx/.config` || true - fi - - if [ ! -z "$nxconfig" ]; then - echo " Building NxWidgets..." - echo "------------------------------------------------------------------------------------" - - cd $nuttx/$NXTOOLS || { echo "Failed to CD to $NXTOOLS"; exit 1; } - ./install.sh $nuttx/$APPSDIR nxwm 1>/dev/null - - ${MAKE} ${MAKE_FLAGS} -C $nuttx/$APPSDIR/external TOPDIR=$nuttx APPDIR=$nuttx/$APPSDIR TOPDIR=$nuttx clean 1>/dev/null - - cd $nuttx || { echo "Failed to CD to $nuttx"; exit 1; } - ${MAKE} ${MAKE_FLAGS} context 1>/dev/null - - cd $nuttx/$NXWIDGETSDIR || { echo "Failed to CD to $NXWIDGETSDIR"; exit 1; } - ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx clean 1>/dev/null - ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx 1>/dev/null - - cd $nuttx/$NXWMDIR || { echo "Failed to CD to $NXWMDIR"; exit 1; } - ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx clean 1>/dev/null - ${MAKE} ${MAKE_FLAGS} TOPDIR=$nuttx 1>/dev/null - fi -} - # Perform the next build function build { @@ -289,7 +249,6 @@ function dotest { echo "------------------------------------------------------------------------------------" distclean configure - nxbuild build } @@ -302,12 +261,6 @@ fi export APPSDIR -if [ -d $NXWDIR ]; then - NXWIDGETSDIR=$NXWDIR/libnxwidgets - NXWMDIR=$NXWDIR/nxwm - NXTOOLS=$NXWDIR/tools -fi - # Shouldn't have to do this testlist=`cat $testfile`