From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F0EDA04AA; Tue, 8 Sep 2020 00:09:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E03241C1BD; Tue, 8 Sep 2020 00:07:39 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 107811C1AF for ; Tue, 8 Sep 2020 00:07:38 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id AAF115C0081; Mon, 7 Sep 2020 18:07:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 07 Sep 2020 18:07:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=alKO7Z75bG8An AhPfIq4zdF1LmeU+rzy0kwjw+F1NG0=; b=krWwClW+gnsLYXuu0Ws2xV6Wakvmq uI4ogusq3czAHZZ61d/XgV2VQh6MpMQ/X1nyXtmv59ba1IlXTNcZ3my5MyvHhOaX Ck2i2uFKq1YHbe1Nqomq1bO3F86OaBLi6oHTaMgmBolTtDXhGhYeMP6YPVL3dloE Rp9FZW2lO5OkZ3sj69PygGFfNRuR+5IvLzMcca3tvTWaHpcGFpDB5oy3wv0tihLj 0sgohLKMqzRQfhasvEx37w2mW5cXvU5p6A4Wl/TL2gIBy7z8vVeoNrI7UJdvNX9+ 99kJd9w4L8f0oeRqjE69+bFM24D2FoNuBWyPulwU4fvseW9V8g/2jMOEg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=alKO7Z75bG8AnAhPfIq4zdF1LmeU+rzy0kwjw+F1NG0=; b=N6bWRiUa UHo3HWgPIbpRc798fQELzYrsDnZX7HHNcUTZNf5lvnDakHw6Cc8vl8pzb0zIj0hu xAdywDc2kBexbh8FMfCh70eN7uyOQjHuqSkT44qlj0hBDjJDwkNIkxig+OPeSwwI 0bAkmBdyNi/hn+axMp6Qrc9WoD59szUlM1nBmkvUJIpoQWhu9Wgqh0uzQKpx6Q1G 6lmQ9bODsVEvgcv5eBxHjFrAdR6evf+G89b0DfxqJaigBOcelvqoo091jyrVGKk2 1bYgs9Iwzjv7mF375t1/kNbkQqdnd7PDv7CSERSAH5YVyIbbuYgoSOz+sz/K36jc cmnta1GJHSHdwQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehuddgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpedvhefgiedvjeegtdevhe efhfetleefgfeivefgffevfeejgedtgfeutdehtdegveenucfkphepjeejrddufeegrddv tdefrddukeegnecuvehluhhsthgvrhfuihiivgepvdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id ECFA0328005A; Mon, 7 Sep 2020 18:07:36 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, ciara.power@intel.com Date: Tue, 8 Sep 2020 00:06:52 +0200 Message-Id: <20200907220711.437405-13-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907220711.437405-1-thomas@monjalon.net> References: <20200903152717.42095-1-ciara.power@intel.com> <20200907220711.437405-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 12/31] buildtools: remove scripts used only with make X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Ciara Power Make is no longer supported for compiling DPDK, scripts used with make are no longer needed. Signed-off-by: Ciara Power --- MAINTAINERS | 4 -- buildtools/auto-config-h.sh | 108 ------------------------------------ buildtools/gen-build-mk.sh | 23 -------- buildtools/gen-config-h.sh | 15 ----- buildtools/relpath.sh | 76 ------------------------- 5 files changed, 226 deletions(-) delete mode 100755 buildtools/auto-config-h.sh delete mode 100755 buildtools/gen-build-mk.sh delete mode 100755 buildtools/gen-config-h.sh delete mode 100755 buildtools/relpath.sh diff --git a/MAINTAINERS b/MAINTAINERS index d8a51b0af1..37f1f1fc56 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -100,10 +100,6 @@ Build System M: Thomas Monjalon F: Makefile F: config/ -F: buildtools/auto-config-h.sh -F: buildtools/gen-build-mk.sh -F: buildtools/gen-config-h.sh -F: buildtools/relpath.sh Meson build M: Bruce Richardson diff --git a/buildtools/auto-config-h.sh b/buildtools/auto-config-h.sh deleted file mode 100755 index 5b613c35fc..0000000000 --- a/buildtools/auto-config-h.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2014-2015 6WIND S.A. -# -# Crude script to detect whether particular types, macros and functions are -# defined by trying to compile a file with a given header. Can be used to -# perform cross-platform checks since the resulting object file is not -# executed. -# -# Set VERBOSE=1 in the environment to display compiler output and errors. -# -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS and EXTRA_CFLAGS are taken from the -# environment. -# -# AUTO_CONFIG_CFLAGS may append additional CFLAGS without modifying the -# above variables. - -file=${1:?output file name required (config.h)} -macro=${2:?output macro name required (HAVE_*)} -include=${3:?include name required (foo.h)} -type=${4:?object type required (define, enum, type, field, func)} -name=${5:?define/type/function name required} - -: ${CC:=cc} - -temp=$(mktemp -t dpdk.${0##*/}.c.XXXXXX) - -case $type in -define) - code="\ -#ifndef $name -#error $name not defined -#endif -" - ;; -enum) - code="\ -long test____ = $name; -" - ;; -type) - code="\ -$name test____; -" - ;; -field) - code="\ -void test____(void) -{ - ${name%%.*} test_____; - - (void)test_____.${name#*.}; -} -" - ;; -func) - code="\ -void (*test____)() = (void (*)())$name; -" - ;; -*) - unset error - : ${error:?unknown object type \"$type\"} - exit -esac - -if [ "${VERBOSE}" = 1 ] -then - err=2 - out=1 - eol=' -' -else - exec 3> /dev/null || - exit - err=3 - out=3 - eol=' ' -fi && -printf 'Looking for %s %s in %s.%s' \ - "${name}" "${type}" "${include}" "${eol}" && -printf "\ -#include <%s> - -%s -" "$include" "$code" > "${temp}" && -if ${CC} ${CPPFLAGS} ${EXTRA_CPPFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ - ${AUTO_CONFIG_CFLAGS} \ - -xc -c -o ${temp}.o "${temp}" 1>&${out} 2>&${err} -then - rm -f "${temp}" "${temp}.o" - printf "\ -#ifndef %s -#define %s 1 -#endif /* %s */ - -" "${macro}" "${macro}" "${macro}" >> "${file}" && - printf 'Defining %s.\n' "${macro}" -else - rm -f "${temp}" "${temp}.o" - printf "\ -/* %s is not defined. */ - -" "${macro}" >> "${file}" && - printf 'Not defining %s.\n' "${macro}" -fi - -exit diff --git a/buildtools/gen-build-mk.sh b/buildtools/gen-build-mk.sh deleted file mode 100755 index 636920b638..0000000000 --- a/buildtools/gen-build-mk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# Auto-generate a Makefile in build directory -# Args: -# $1: path of project src root - -echo "# Automatically generated by gen-build-mk.sh" -echo -echo "ifdef O" -echo "ifeq (\"\$(origin O)\", \"command line\")" -echo "\$(error \"Cannot specify O= as you are already in a build directory\")" -echo "endif" -echo "endif" -echo -echo "MAKEFLAGS += --no-print-directory" -echo -echo "all:" -echo " @\$(MAKE) -C $1 O=\$(CURDIR)" -echo -echo "%::" -echo " @\$(MAKE) -C $1 O=\$(CURDIR) \$@" diff --git a/buildtools/gen-config-h.sh b/buildtools/gen-config-h.sh deleted file mode 100755 index a8c2006339..0000000000 --- a/buildtools/gen-config-h.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -echo "#ifndef __RTE_CONFIG_H" -echo "#define __RTE_CONFIG_H" -grep CONFIG_ $1 | -grep -v '^[ \t]*#' | -sed 's,CONFIG_\(.*\)=y.*$,#undef \1\ -#define \1 1,' | -sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' | -sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\ -#define \1 \2,' | -sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,' -echo "#endif /* __RTE_CONFIG_H */" diff --git a/buildtools/relpath.sh b/buildtools/relpath.sh deleted file mode 100755 index 02953837a2..0000000000 --- a/buildtools/relpath.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# print the relative path of $1 from $2 directory -# $1 and $2 MUST be absolute paths -# - -if [ $# -ne 2 ]; then - echo "Bad arguments" - echo "Usage:" - echo " $0 path1 path2" - exit 1 -fi - -# get the real absolute path, derefencing symlinks -ABS1="$(dirname $(readlink -f $1))/$(basename $1)" -ABS2=$(readlink -f $2) - -# remove leading slash -REL1=${ABS1#/} -REL2=${ABS2#/} - -left1=${REL1%%/*} -right1=${REL1#*/} -prev_right1=$REL1 -prev_left1= - -left2=${REL2%%/*} -right2=${REL2#*/} -prev_right2=$REL2 -prev_left2= - -prefix= - -while [ "${right1}" != "" -a "${right2}" != "" ]; do - - if [ "$left1" != "$left2" ]; then - break - fi - - prev_left1=$left1 - left1=$left1/${right1%%/*} - prev_right1=$right1 - right1=${prev_right1#*/} - if [ "$right1" = "$prev_right1" ]; then - right1="" - fi - - prev_left2=$left2 - left2=$left2/${right2%%/*} - prev_right2=$right2 - right2=${prev_right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -if [ "${left1}" != "${left2}" ]; then - right2=${prev_right2} - right1=${prev_right1} -fi - -while [ "${right2}" != "" ]; do - prefix=${prefix}../ - prev_right2=$right2 - right2=${right2#*/} - if [ "$right2" = "$prev_right2" ]; then - right2="" - fi -done - -echo ${prefix}${right1} - -exit 0 -- 2.28.0