diff mbox series

[v3,14/37] devtools: remove use of make in scripts

Message ID 20200903152717.42095-15-ciara.power@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series remove make support in DPDK | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Power, Ciara Sept. 3, 2020, 3:26 p.m. UTC
Make is no longer supported, the test script for make builds is no
longer required. Uses of make in other tool scripts are replaced.

Signed-off-by: Ciara Power <ciara.power@intel.com>
---
 MAINTAINERS                |   1 -
 devtools/build-tags.sh     |  14 +-
 devtools/check-includes.sh |   3 +-
 devtools/git-log-fixes.sh  |   2 +-
 devtools/test-build.sh     | 315 -------------------------------------
 5 files changed, 4 insertions(+), 331 deletions(-)
 delete mode 100755 devtools/test-build.sh

Comments

Thomas Monjalon Sept. 6, 2020, 10:15 a.m. UTC | #1
On Thu Sep 3, 2020 at 6:26 PM CEST, Ciara Power wrote:
> --- a/devtools/build-tags.sh
> +++ b/devtools/build-tags.sh
[...]
> + echo "Examples of valid configs are: "
> + echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc,
> ppc_64-power8-linux-gcc"

Only arch and OS are used in this script.
I would give these simpler examples:
	x86_64-bsd, arm64-linux, ppc_64-linux

[...]
> --- a/devtools/check-includes.sh
> +++ b/devtools/check-includes.sh
> @@ -17,8 +17,7 @@
> #
> # SUMMARY=1 is the same as -s.
> #
> -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and
> -# EXTRA_CXXFLAGS are taken into account.
> +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account.

The comment is changed but not the script.
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 392150fc3b..0fec96558e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -90,7 +90,6 @@  F: devtools/checkpatches.sh
 F: devtools/get-maintainer.sh
 F: devtools/git-log-fixes.sh
 F: devtools/load-devel-config
-F: devtools/test-build.sh
 F: devtools/test-meson-builds.sh
 F: devtools/words-case.txt
 F: license/
diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh
index 276fff647b..614ce4c3a4 100755
--- a/devtools/build-tags.sh
+++ b/devtools/build-tags.sh
@@ -19,8 +19,8 @@  arm_64=true
 print_usage()
 {
 	echo "Usage: $(basename $0) [-h] [-v] tags|cscope|gtags|etags [config]"
-	echo "Valid configs are:"
-	make showconfigs | sed 's,^,\t,'
+	echo "Examples of valid configs are: "
+	echo "x86_64-native-linux-gcc, arm64-armv8a-linux-gcc, ppc_64-power8-linux-gcc"
 }
 
 # Move to the root of the git tree
@@ -125,17 +125,7 @@  ppc_64_sources()
 	find_sources "$source_dirs" '*altivec*.[chS]'
 }
 
-check_valid_target()
-{
-	if [ ! -f "config/defconfig_$1" ] ; then
-		echo "Invalid config: $1"
-		print_usage
-		exit 0
-	fi
-}
-
 if [ -n "$2" ]; then
-	check_valid_target $2
 
 	echo $2 | grep -q "linux" || linux=false
 	echo $2 | grep -q "bsd" || bsd=false
diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh
index 749b9b26d2..15594f08a3 100755
--- a/devtools/check-includes.sh
+++ b/devtools/check-includes.sh
@@ -17,8 +17,7 @@ 
 #
 # SUMMARY=1 is the same as -s.
 #
-# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and
-# EXTRA_CXXFLAGS are taken into account.
+# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account.
 #
 # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict
 # C/C++ compilation flags.
diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh
index 6d468d6731..210c8dcf25 100755
--- a/devtools/git-log-fixes.sh
+++ b/devtools/git-log-fixes.sh
@@ -50,7 +50,7 @@  commit_version () # <hash>
 		head -n1)
 	if [ -z "$tag" ] ; then
 		# before -rc1 tag of release in progress
-		make showversion | cut -d'.' -f-2
+		cat VERSION | cut -d'.' -f-2
 	else
 		echo $tag | sed 's,^v,,' | sed 's,-rc.*,,'
 	fi
diff --git a/devtools/test-build.sh b/devtools/test-build.sh
deleted file mode 100755
index f013656024..0000000000
--- a/devtools/test-build.sh
+++ /dev/null
@@ -1,315 +0,0 @@ 
-#! /bin/sh -e
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2015 6WIND S.A.
-
-default_path=$PATH
-
-# Load config options:
-# - ARMV8_CRYPTO_LIB_PATH
-# - DPDK_ABI_REF_DIR
-# - DPDK_ABI_REF_VERSION
-# - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2)
-# - DPDK_BUILD_TEST_DIR
-# - DPDK_DEP_ARCHIVE
-# - DPDK_DEP_BPF (y/[n])
-# - DPDK_DEP_CFLAGS
-# - DPDK_DEP_ELF (y/[n])
-# - DPDK_DEP_FDT (y/[n])
-# - DPDK_DEP_ISAL (y/[n])
-# - DPDK_DEP_JSON (y/[n])
-# - DPDK_DEP_LDFLAGS
-# - DPDK_DEP_MLX (y/[n])
-# - DPDK_DEP_NFB (y/[n])
-# - DPDK_DEP_NUMA ([y]/n)
-# - DPDK_DEP_PCAP (y/[n])
-# - DPDK_DEP_SSL (y/[n])
-# - DPDK_DEP_IPSEC_MB (y/[n])
-# - DPDK_DEP_SZE (y/[n])
-# - DPDK_DEP_ZLIB (y/[n])
-# - DPDK_MAKE_JOBS (int)
-# - DPDK_NOTIFY (notify-send)
-# - FLEXRAN_SDK
-# - LIBMUSDK_PATH
-devtools_dir=$(dirname $(readlink -f $0))
-. $devtools_dir/load-devel-config
-
-print_usage () {
-	echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]"
-}
-
-print_help () {
-	echo 'Test building several targets with different options'
-	echo
-	print_usage
-	cat <<- END_OF_HELP
-
-	options:
-	        -h    this help
-	        -jX   use X parallel jobs in "make"
-	        -s    short test only first config without tests|examples|doc
-	        -v    verbose build
-
-	config: defconfig[[~][+]option1[[~][+]option2...]]
-	        Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS
-	        The lowercase options are defined inside $(basename $0).
-	        The uppercase options can be the end of a defconfig option
-	        to enable if prefixed with '+' or to disable if prefixed with '~'.
-	        Default is to automatically enable most of the options.
-	        The external dependencies are setup with DPDK_DEP_* variables.
-	        If no config on command line, DPDK_BUILD_TEST_CONFIGS is used.
-	END_OF_HELP
-}
-
-[ -z $MAKE ] && command -v gmake > /dev/null && MAKE=gmake
-[ -z $MAKE ] && command -v make > /dev/null && MAKE=make
-[ -z $MAKE ] && echo "Cannot find make or gmake" && exit 1
-
-J=$DPDK_MAKE_JOBS
-builds_dir=${DPDK_BUILD_TEST_DIR:-.}
-short=false
-unset verbose
-while getopts hj:sv ARG ; do
-	case $ARG in
-		j ) J=$OPTARG ;;
-		s ) short=true ;;
-		v ) verbose='V=1' ;;
-		h ) print_help ; exit 0 ;;
-		? ) print_usage ; exit 1 ;;
-	esac
-done
-shift $(($OPTIND - 1))
-configs=${*:-$DPDK_BUILD_TEST_CONFIGS}
-
-success=false
-on_exit ()
-{
-	if $success ; then
-		[ "$DPDK_NOTIFY" != notify-send ] || \
-			notify-send -u low --icon=dialog-information 'DPDK build' 'finished'
-	elif [ -z "$signal" ] ; then
-		[ -z "$dir" ] || echo "failed to build $dir" >&2
-		[ "$DPDK_NOTIFY" != notify-send ] || \
-			notify-send -u low --icon=dialog-error 'DPDK build' 'failed'
-	fi
-}
-# catch manual interrupt to ignore notification
-trap "signal=INT ; trap - INT ; kill -INT $$" INT
-# notify result on exit
-trap on_exit EXIT
-
-cd $devtools_dir/..
-
-reset_env ()
-{
-	export PATH=$default_path
-	unset CROSS
-	unset DPDK_DEP_ARCHIVE
-	unset DPDK_DEP_BPF
-	unset DPDK_DEP_CFLAGS
-	unset DPDK_DEP_ELF
-	unset DPDK_DEP_FDT
-	unset DPDK_DEP_ISAL
-	unset DPDK_DEP_JSON
-	unset DPDK_DEP_LDFLAGS
-	unset DPDK_DEP_MLX
-	unset DPDK_DEP_NFB
-	unset DPDK_DEP_NUMA
-	unset DPDK_DEP_PCAP
-	unset DPDK_DEP_SSL
-	unset DPDK_DEP_IPSEC_MB
-	unset DPDK_DEP_SZE
-	unset DPDK_DEP_ZLIB
-	unset ARMV8_CRYPTO_LIB_PATH
-	unset FLEXRAN_SDK
-	unset LIBMUSDK_PATH
-	unset PQOS_INSTALL_PATH
-}
-
-config () # <directory> <target> <options>
-{
-	reconfig=false
-	if git rev-parse 2>&- && [ -n "$(git diff HEAD~ -- config)" ] ; then
-		echo 'Default config may have changed'
-		reconfig=true
-	fi
-	if [ ! -e $1/.config ] || $reconfig ; then
-		echo "================== Configure $1"
-		${MAKE} T=$2 O=$1 config
-
-		echo 'Customize configuration'
-		# Built-in options (lowercase)
-		! echo $3 | grep -q '+default' || \
-		sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
-		! echo $3 | grep -q '+kmods' || \
-		sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config
-		echo $3 | grep -q '+next' || \
-		sed -ri=""           's,(NEXT_ABI=)y,\1n,' $1/.config
-		! echo $3 | grep -q '+shared' || \
-		sed -ri=""         's,(SHARED_LIB=)n,\1y,' $1/.config
-		! echo $3 | grep -q '+debug' || ( \
-		sed -ri=""  's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config
-		sed -ri=""           's,(_DEBUG.*=)n,\1y,' $1/.config
-		sed -ri=""  's,(_STAT)([S_].*=|=)n,\1\2y,' $1/.config
-		sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
-
-		# Automatic configuration
-		! echo $2 | grep -q 'arm64' || \
-		sed -ri=""        's,(ARM_USE_WFE=)n,\1y,' $1/.config
-		test "$DPDK_DEP_NUMA" != n || \
-		sed -ri=""             's,(NUMA.*=)y,\1n,' $1/.config
-		sed -ri=""    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
-		sed -ri=""             's,(BYPASS=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ARCHIVE" != y || \
-		sed -ri=""       's,(RESOURCE_TAR=)n,\1y,' $1/.config
-		test "$DPDK_DEP_BPF" != y || \
-		sed -ri=""         's,(PMD_AF_XDP=)n,\1y,' $1/.config
-		test "$DPDK_DEP_FDT" != y || \
-		sed -ri=""   's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config
-		test "$DPDK_DEP_FDT" != y || \
-		sed -ri=""         's,(IPN3KE_PMD=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ISAL" != y || \
-		sed -ri=""           's,(PMD_ISAL=)n,\1y,' $1/.config
-		test "$DPDK_DEP_MLX" != y || \
-		sed -ri=""          's,(MLX.*_PMD=)n,\1y,' $1/.config
-		test "$DPDK_DEP_NFB" != y || \
-		sed -ri=""            's,(NFB_PMD=)n,\1y,' $1/.config
-		test "$DPDK_DEP_SZE" != y || \
-		sed -ri=""       's,(PMD_SZEDATA2=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ZLIB" != y || \
-		sed -ri=""          's,(BNX2X_PMD=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ZLIB" != y || \
-		sed -ri=""           's,(PMD_ZLIB=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ZLIB" != y || \
-		sed -ri=""   's,(COMPRESSDEV_TEST=)n,\1y,' $1/.config
-		test "$DPDK_DEP_PCAP" != y || \
-		sed -ri=""               's,(PCAP=)n,\1y,' $1/.config
-		test -z "$ARMV8_CRYPTO_LIB_PATH" || \
-		sed -ri=""   's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config
-		test "$DPDK_DEP_IPSEC_MB" != y || \
-		sed -ri=""       's,(PMD_AESNI_MB=)n,\1y,' $1/.config
-		test "$DPDK_DEP_IPSEC_MB" != y || \
-		sed -ri=""      's,(PMD_AESNI_GCM=)n,\1y,' $1/.config
-		test "$DPDK_DEP_IPSEC_MB" != y || \
-		sed -ri=""            's,(PMD_ZUC=)n,\1y,' $1/.config
-		test "$DPDK_DEP_IPSEC_MB" != y || \
-		sed -ri=""         's,(PMD_KASUMI=)n,\1y,' $1/.config
-		test "$DPDK_DEP_IPSEC_MB" != y || \
-		sed -ri=""         's,(PMD_SNOW3G=)n,\1y,' $1/.config
-		test "$DPDK_DEP_SSL" != y || \
-		sed -ri=""            's,(PMD_CCP=)n,\1y,' $1/.config
-		test "$DPDK_DEP_SSL" != y || \
-		sed -ri=""        's,(PMD_OPENSSL=)n,\1y,' $1/.config
-		test "$DPDK_DEP_SSL" != y || \
-		sed -ri=""            's,(QAT_SYM=)n,\1y,' $1/.config
-		test -z "$FLEXRAN_SDK" || \
-		sed -ri=""     's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config
-		sed -ri=""           's,(SCHED_.*=)n,\1y,' $1/.config
-		test -z "$LIBMUSDK_PATH" || \
-		sed -ri=""   's,(PMD_MVSAM_CRYPTO=)n,\1y,' $1/.config
-		test -z "$LIBMUSDK_PATH" || \
-		sed -ri=""          's,(MVPP2_PMD=)n,\1y,' $1/.config
-		test -z "$LIBMUSDK_PATH" || \
-		sed -ri=""         's,(MVNETA_PMD=)n,\1y,' $1/.config
-		test "$DPDK_DEP_ELF" != y || \
-		sed -ri=""            's,(BPF_ELF=)n,\1y,' $1/.config
-		test "$DPDK_DEP_JSON" != y || \
-		sed -ri=""          's,(TELEMETRY=)n,\1y,' $1/.config
-		build_config_hook $1 $2 $3
-
-		# Explicit enabler/disabler (uppercase)
-		for option in $(echo $3 | sed 's,[~+], &,g') ; do
-			pattern=$(echo $option | cut -c2-)
-			if echo $option | grep -q '^~' ; then
-				sed -ri="" "s,($pattern=)y,\1n," $1/.config
-			elif echo $option | grep -q '^+' ; then
-				sed -ri="" "s,($pattern=)n,\1y," $1/.config
-			fi
-		done
-	fi
-}
-
-# default empty hook to override in devel config
-build_config_hook () # <directory> <target> <options>
-{
-	:
-}
-
-for conf in $configs ; do
-	target=$(echo $conf | sed 's,[~+].*,,')
-	# reload config with DPDK_TARGET set
-	DPDK_TARGET=$target
-	reset_env
-	. $devtools_dir/load-devel-config
-
-	options=$(echo $conf | sed 's,[^~+]*,,')
-	dir=$builds_dir/$conf
-	config $dir $target $options
-
-	echo "================== Build $conf"
-	${MAKE} -j$J EXTRA_CFLAGS="-Wfatal-errors -g $DPDK_DEP_CFLAGS" \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose O=$dir
-	! $short || break
-	export RTE_TARGET=$target
-	rm -rf $dir/install
-	${MAKE} install O=$dir DESTDIR=$dir/install prefix=
-	echo "================== Build examples for $conf"
-	export RTE_SDK=$(readlink -f $dir)/install/share/dpdk
-	ln -sTf $(pwd)/lib $RTE_SDK/lib # workaround for vm_power_manager
-	grep -q 'SHARED_LIB=n' $dir/.config || # skip examples with static libs
-	${MAKE} -j$J -sC examples \
-		EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
-		O=$(readlink -f $dir)/examples
-	unset RTE_TARGET
-	grep -q 'SHARED_LIB=n' $dir/.config || # skip ABI check with static libs
-	if [ -n "$DPDK_ABI_REF_VERSION" ]; then
-		abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION
-		if [ ! -d $abirefdir/$conf ]; then
-			# clone current sources
-			if [ ! -d $abirefdir/src ]; then
-				git clone --local --no-hardlinks \
-					--single-branch \
-					-b $DPDK_ABI_REF_VERSION \
-					$(pwd) $abirefdir/src
-			fi
-
-			cd $abirefdir/src
-
-			rm -rf $abirefdir/build
-			config $abirefdir/build $target $options
-
-			echo -n "================== Build $conf "
-			echo "($DPDK_ABI_REF_VERSION)"
-			${MAKE} -j$J \
-				EXTRA_CFLAGS="-Wno-error -g $DPDK_DEP_CFLAGS" \
-				EXTRA_LDFLAGS="$DPDK_DEP_LDFLAGS" $verbose \
-				O=$abirefdir/build
-			export RTE_TARGET=$target
-			${MAKE} install O=$abirefdir/build \
-				DESTDIR=$abirefdir/$conf \
-				prefix=
-			unset RTE_TARGET
-			$devtools_dir/gen-abi.sh $abirefdir/$conf
-
-			# back to current workdir
-			cd $devtools_dir/..
-		fi
-
-		echo "================== Check ABI $conf"
-		$devtools_dir/gen-abi.sh $dir/install
-		$devtools_dir/check-abi.sh $abirefdir/$conf $dir/install
-	fi
-	echo "################## $conf done."
-	unset dir
-done
-
-if ! $short ; then
-	mkdir -p .check
-	echo "================== Build doxygen HTML API"
-	${MAKE} doc-api-html >/dev/null 2>.check/doc.txt
-	echo "================== Build sphinx HTML guides"
-	${MAKE} doc-guides-html >/dev/null 2>>.check/doc.txt
-	echo "================== Check docs"
-	diff -u /dev/null .check/doc.txt
-fi
-
-success=true