From patchwork Fri Dec 12 12:43:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 42182 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E66EF26C77 for ; Fri, 12 Dec 2014 12:44:21 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id l18sf4827236wgh.10 for ; Fri, 12 Dec 2014 04:44:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=MaXnHdGXlk6mqF3W4cxbHi4s9aVf5S/OENDRBRisfcc=; b=bVAAEZE8AYKGA7yugqXcM3bjQlvB/lm4JK5Y+feH5MztjXN2Qcmpebdinmtk3rO+XC DLBpL/t0wQvWw75JdJA4jem+O9TtGfZjsN5igKGsS4OVZotym/ctgco2seOL8tLwecdA qb8HqEJa5Yl8Iz8j2sKiJf6EDbrBFScNaZe3hCnp3hR6Fx1BeJTQ4ofOMpestLojl44H n4Uvcr9+rbHSRpYQI7PrrM+UFuuy/KI1K6IBs1RNhB0sq0GZ6KOCYpGQdrxTLALt3+p8 cX6jYjTMB709DmJLg+I21Qcssth3k/BhrI4Rp+PK6rbdbp6dIK3KKN/rEDnadQZO7IMy I/4w== X-Gm-Message-State: ALoCoQmzfEID6ooCm587ChsADetr3KbBLsDiEUSCXkkIWQXg2vF5gseejt4Nl5LcN2qTmeHJsXJW X-Received: by 10.180.8.9 with SMTP id n9mr689662wia.6.1418388261231; Fri, 12 Dec 2014 04:44:21 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.132 with SMTP id n4ls240013lae.57.gmail; Fri, 12 Dec 2014 04:44:20 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr15433729lbc.34.1418388260764; Fri, 12 Dec 2014 04:44:20 -0800 (PST) Received: from mail-lb0-f173.google.com (mail-lb0-f173.google.com. [209.85.217.173]) by mx.google.com with ESMTPS id n9si1293584lbc.57.2014.12.12.04.44.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Dec 2014 04:44:20 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) client-ip=209.85.217.173; Received: by mail-lb0-f173.google.com with SMTP id z12so5843079lbi.18 for ; Fri, 12 Dec 2014 04:44:20 -0800 (PST) X-Received: by 10.112.42.198 with SMTP id q6mr15243288lbl.69.1418388260647; Fri, 12 Dec 2014 04:44:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.142.69 with SMTP id ru5csp839910lbb; Fri, 12 Dec 2014 04:44:19 -0800 (PST) X-Received: by 10.224.79.136 with SMTP id p8mr30672917qak.70.1418388259056; Fri, 12 Dec 2014 04:44:19 -0800 (PST) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id o45si1327250qgd.14.2014.12.12.04.44.17 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 12 Dec 2014 04:44:19 -0800 (PST) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XzPZv-0008Ny-Mw; Fri, 12 Dec 2014 12:44:15 +0000 Received: from mail-lb0-f182.google.com ([209.85.217.182]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1XzPZq-0008Nq-LI for lng-odp@lists.linaro.org; Fri, 12 Dec 2014 12:44:10 +0000 Received: by mail-lb0-f182.google.com with SMTP id f15so6404812lbj.13 for ; Fri, 12 Dec 2014 04:44:04 -0800 (PST) X-Received: by 10.152.5.165 with SMTP id t5mr10656293lat.62.1418388244811; Fri, 12 Dec 2014 04:44:04 -0800 (PST) Received: from localhost.localdomain (ppp91-76-163-205.pppoe.mtu-net.ru. [91.76.163.205]) by mx.google.com with ESMTPSA id zo3sm375322lbb.10.2014.12.12.04.44.03 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Dec 2014 04:44:04 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 12 Dec 2014 15:43:57 +0300 Message-Id: <1418388237-1282-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.8.5.1.163.gd7aced9 X-Topics: patch Subject: [lng-odp] [PATCHv3] odp version script X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxim.uvarov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Update odp version in one place (C code), and use it for doxygen also. Signed-off-by: Maxim Uvarov Reviewed-by: Anders Roxell --- configure.ac | 2 +- doc/doxygen.cfg | 2 +- m4/ax_prog_doxygen.m4 | 2 +- scripts/odp_version.sh | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100755 scripts/odp_version.sh diff --git a/configure.ac b/configure.ac index 2f27261..8dbad4b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.5]) -AC_INIT([OpenDataPlane], [0.4.0], [lng-odp@lists.linaro.org]) +AC_INIT([OpenDataPlane], m4_esyscmd(./scripts/odp_version.sh), [lng-odp@lists.linaro.org]) AM_INIT_AUTOMAKE([subdir-objects]) AC_CONFIG_SRCDIR([helper/config.h.in]) AM_CONFIG_HEADER([helper/config.h]) diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg index 03bcc20..050c94a 100644 --- a/doc/doxygen.cfg +++ b/doc/doxygen.cfg @@ -1,5 +1,5 @@ PROJECT_NAME = "API Reference Manual" -PROJECT_NUMBER = 0.4.0 +PROJECT_NUMBER = $(VERSION) PROJECT_LOGO = $(SRCDIR)/doc/images/ODP-Logo-HQ.png QUIET = YES OUTPUT_DIRECTORY = $(DOCDIR) diff --git a/m4/ax_prog_doxygen.m4 b/m4/ax_prog_doxygen.m4 index aa4acc2..0f58b3e 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -407,7 +407,7 @@ AC_SUBST([DX_DOCDIR], [ifelse([$3], [], doxygen-doc, [$3])]) DX_ENV_APPEND(SRCDIR, $srcdir) DX_ENV_APPEND(PROJECT, $DX_PROJECT) DX_ENV_APPEND(DOCDIR, $DX_DOCDIR) -DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) +DX_ENV_APPEND(VERSION, $VERSION) # Doxygen itself: DX_ARG_ABLE(doc, [generate any doxygen documentation], diff --git a/scripts/odp_version.sh b/scripts/odp_version.sh new file mode 100755 index 0000000..72ae404 --- /dev/null +++ b/scripts/odp_version.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +VFILE="platform/linux-generic/include/api/odp_version.h" + +GEN=`grep "define ODP_VERSION_API_GENERATION" ${VFILE} | cut -d ' ' -f 3` +MAJ=`grep "define ODP_VERSION_API_MAJOR" ${VFILE} | cut -d ' ' -f 3` +MIN=`grep "define ODP_VERSION_API_MINOR" ${VFILE} | cut -d ' ' -f 3` + +echo -n $GEN.$MAJ.$MIN