From patchwork Fri Sep 20 12:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 144357 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 663964599D; Fri, 20 Sep 2024 14:58:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DAC143440; Fri, 20 Sep 2024 14:58:05 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by mails.dpdk.org (Postfix) with ESMTP id D60CA43437 for ; Fri, 20 Sep 2024 14:58:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726837084; x=1758373084; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y8aizJhlW7UlWfT2HCIzDeJvlOy+9ZhayKRGyukrPeg=; b=nOUuJa+xbrHolorDS1xVPLTM5UCBM+gnJYYlWIFH0BsOdjd9VEvg5NWF m/kb8um8SMK887Dg8OuZpR1ON75xDGy86YaM57OuYBaBK6pv0+fkbzfY5 VRkQ22k4D+BEthLJKjrif9gWMWteAYn2WxR8iiAiTomtX8GpdoXsU89/H TnAfEiO+F3RCdMLdhgOkuWMaJuG/jmxg5PD5UWdbkwpwH49Z6EJ2xpsst Hi1DXE3IAcOMKT0k/gYFhgGTeWEgSF9UQjLePjg1PphXv74DmcBFAOqjC Q1u+hzhZNbuT6sJSHaelZK14UZtOhOoKbAAvaydIfvU0TNcobomE1MQLE A==; X-CSE-ConnectionGUID: yhGiergUSBO41lqwV4ATZA== X-CSE-MsgGUID: 65J3dBEbQji6pvRYZqqMmQ== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="25991108" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="25991108" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 05:58:04 -0700 X-CSE-ConnectionGUID: kvtm5eHeR6e0JWeAEHA47w== X-CSE-MsgGUID: x/B/PVIzTr6gMahe6ik59Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="71135918" Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25]) by orviesa008.jf.intel.com with ESMTP; 20 Sep 2024 05:58:03 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: mb@smartsharesystems.com, thomas@monjalon.net, david.marchand@redhat.com, Bruce Richardson Subject: [PATCH 4/5] build: use version file support from meson Date: Fri, 20 Sep 2024 13:57:36 +0100 Message-ID: <20240920125737.1197969-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240920125737.1197969-1-bruce.richardson@intel.com> References: <20240920125737.1197969-1-bruce.richardson@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rather than having to use run_command to shell out and read the VERSION file for the DPDK version, we can use the support added directly to meson in version 0.57. Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry --- meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 69888834b4..fe9040369a 100644 --- a/meson.build +++ b/meson.build @@ -2,10 +2,7 @@ # Copyright(c) 2017-2019 Intel Corporation project('DPDK', 'c', - # Get version number from file. - # Fallback to "more" for Windows compatibility. - version: run_command(find_program('cat', 'more'), - files('VERSION'), check: true).stdout().strip(), + version: files('VERSION'), license: 'BSD', default_options: [ 'buildtype=release',