sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/tesbuild.sh: No longer installs and builds the NxWidgets libraries. They are now a port of apps/.

Browse Source
This commit is contained in:
Gregory Nutt 2018-09-16 07:13:18 -06:00
parent b3d0574c98
commit 68a7fbf109
1 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tools/testbuild.sh
View File

@ -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 <appsdir> provides the relative path to the apps/ directory. Default ../apps"
echo " -t <topdir> provides the absolute path to top nuttx/ directory. Default $PWD/../nuttx"
echo " -n <nxdir> 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`