Remove the size related option from sehost.sh and testbuild.sh

to aglin with configure.sh

Change-Id: I42f2621dff72b22ee6c51bd44cc4a1c3d81d128e
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-01-20 01:08:49 +08:00 committed by patacongo
parent d0b34dec97
commit f316c15769
3 changed files with 3 additions and 33 deletions

View File

@ -893,14 +893,13 @@ sethost.sh
$ ./sethost.sh -h
USAGE: ./sethost.sh [-w|l|m] [-c|u|g|n] [-32|64] [<config>]
USAGE: ./sethost.sh [-w|l|m] [-c|u|g|n] [<config>]
./sethost.sh -h
Where:
-w|l|m selects Windows (w), Linux (l), or macOS (m). Default: Linux
-c|u|g|n selects Windows environment option: Cygwin (c), Ubuntu under
Windows 10 (u), MSYS/MSYS2 (g) or Windows native (n). Default Cygwin
-32|64 selects 32- or 64-bit host. Default 64
-h will show this help test and terminate
<config> selects configuration file. Default: .config
@ -936,14 +935,13 @@ testbuild.sh
$ ./testbuild.sh -h
USAGE: ./testbuild.sh [-w|l] [-c|u|n] [-s] [-a <appsdir>] [-n <nxdir>] <testlist-file>
USAGE: ./testbuild.sh [-w|l] [-c|u|n] [-a <appsdir>] [-n <nxdir>] <testlist-file>
./testbuild.sh -h
Where:
-w|l selects Windows (w) or Linux (l). Default: Linux
-c|u|n selects Windows environment option: Cygwin (c), Ubuntu under
Windows 10 (u), or Windows native (n). Default Cygwin
-s Use C++ unsigned long size_t in new operator. Default unsigned int
-a <appsdir> provides the relative path to the apps/ directory. Default ../apps
-n <nxdir> provides the relative path to the NxWidgets/ directory. Default ../NxWidgets
-d enables script debug output

View File

@ -35,7 +35,6 @@
progname=$0
host=linux
wenv=cygwin
hsize=64
unset configfile
function showusage {
@ -47,7 +46,6 @@ function showusage {
echo " -w|l|m selects Windows (w), Linux (l), or macOS (m). Default: Linux"
echo " -c|u|g|n selects Windows environment option: Cygwin (c), Ubuntu under"
echo " Windows 10 (u), MSYS/MSYS2 (g) or Windows native (n). Default Cygwin"
echo " -32|64 selects 32- or 64-bit host. Default 64"
echo " -h will show this help test and terminate"
echo " <config> selects configuration file. Default: .config"
exit 1
@ -82,12 +80,6 @@ while [ ! -z "$1" ]; do
host=windows
wenv=native
;;
-32 )
hsize=32
;;
-64 )
hsize=32
;;
-h )
showusage
;;
@ -242,12 +234,6 @@ else
fi
fi
fi
if [ "X$hsize" == "X32" ]; then
kconfig-tweak --file $nuttx/.config --enable CONFIG_SIM_M32
else
kconfig-tweak --file $nuttx/.config --disable CONFIG_SIM_M32
fi
fi
kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER

View File

@ -38,7 +38,6 @@ nuttx=$WD/../nuttx
progname=$0
host=linux
wenv=cygwin
sizet=uint
APPSDIR=../apps
MAKE_FLAGS=-i
MAKE=make
@ -47,14 +46,13 @@ unset JOPTION
function showusage {
echo ""
echo "USAGE: $progname [-w|l] [-c|u|n] [-s] [-d] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] <testlist-file>"
echo "USAGE: $progname [-w|l] [-c|u|n] [-d] [-x] [-j <ncpus>] [-a <appsdir>] [-t <topdir>] <testlist-file>"
echo " $progname -h"
echo ""
echo "Where:"
echo " -w|l selects Windows (w) or Linux (l). Default: Linux"
echo " -c|u|n selects Windows environment option: Cygwin (c), Ubuntu under"
echo " Windows 10 (u), or Windows native (n). Default Cygwin"
echo " -s Use C++ unsigned long size_t in new operator. Default unsigned int"
echo " -d enables script debug output"
echo " -x exit on build failures"
echo " -j <ncpus> passed on to make. Default: No -j make option."
@ -94,10 +92,6 @@ while [ ! -z "$1" ]; do
host=windows
wenv=native
;;
-s )
host=windows
sizet=long
;;
-x )
MAKE_FLAGS='--silent --no-print-directory'
set -e
@ -215,14 +209,6 @@ function configure {
kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_MACOS
kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER
if [ "X$sizet" == "Xlong" ]; then
echo " Select CONFIG_CXX_NEWLONG=y"
kconfig-tweak --file $nuttx/.config --enable CONFIG_CXX_NEWLONG
else
echo " Disable CONFIG_CXX_NEWLONG"
kconfig-tweak --file $nuttx/.config --disable CONFIG_CXX_NEWLONG
fi
if [ "X$toolchain" != "X" ]; then
setting=`grep TOOLCHAIN $nuttx/.config | grep -v CONFIG_ARCH_TOOLCHAIN_GNU=y | grep =y`
varname=`echo $setting | cut -d'=' -f1`