From patchwork Thu Dec 11 11:41:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 42110 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 74F5526666 for ; Thu, 11 Dec 2014 11:41:53 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id r20sf3585424wiv.5 for ; Thu, 11 Dec 2014 03:41:52 -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=yW7NZ832LC6QtpLjJvW/EajPrAk/O7JM75lPVE00SAA=; b=IqOadc7j+tdjfGZUMqMreH0VeJ9eni/3WmvQRsZmRewvuS4fQ+Gax4z4r98Md5lMbn 4qPKzKy5XNZV6+yjD0Wwfta2+1ErFsp7H68mGpCNpFujCe+dalIUyblI6QdSDj+IU+Fe Gzg9YsWZmg7vQlI7T5Wpn7msTwFYxy4Y1W/BzX/cSbgQZV7Bt+KPIXjucflIpdDJAkSL a6ncdi0YtlcqjtJc7ugyFY1UhbxYgiiIIZtm6Afy99klG+50uSeGEV5j2WIvSJMjWe6M /b9/XlotkXBjG2jxivEFt92DMsmF8SYdmpww5oIPiu/rMAsXsFH7fw+70P8At8GhWfNE flCw== X-Gm-Message-State: ALoCoQlSjO1xO4L83pcrif/Aeuq1NzRd+xhIA4W0iZ/GIlDoj/W7N5+yM3KbEin9tLYAJCW8czAA X-Received: by 10.112.159.199 with SMTP id xe7mr13994lbb.21.1418298112735; Thu, 11 Dec 2014 03:41:52 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.42 with SMTP id p10ls220118lah.98.gmail; Thu, 11 Dec 2014 03:41:52 -0800 (PST) X-Received: by 10.112.8.69 with SMTP id p5mr9221517lba.97.1418298112494; Thu, 11 Dec 2014 03:41:52 -0800 (PST) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id rd1si1009844lac.70.2014.12.11.03.41.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 03:41:52 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so4041688lbv.12 for ; Thu, 11 Dec 2014 03:41:52 -0800 (PST) X-Received: by 10.152.7.229 with SMTP id m5mr9452959laa.80.1418298112126; Thu, 11 Dec 2014 03:41:52 -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 ru5csp493391lbb; Thu, 11 Dec 2014 03:41:51 -0800 (PST) X-Received: by 10.224.51.11 with SMTP id b11mr18594758qag.43.1418298110732; Thu, 11 Dec 2014 03:41:50 -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 n16si959632qar.14.2014.12.11.03.41.49 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 11 Dec 2014 03:41:50 -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 1Xz27w-0005u0-3o; Thu, 11 Dec 2014 11:41:48 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1Xz27p-0005rz-SG for lng-odp@lists.linaro.org; Thu, 11 Dec 2014 11:41:42 +0000 Received: by mail-la0-f45.google.com with SMTP id gq15so4107943lab.32 for ; Thu, 11 Dec 2014 03:41:36 -0800 (PST) X-Received: by 10.112.52.37 with SMTP id q5mr9266206lbo.32.1418298095909; Thu, 11 Dec 2014 03:41:35 -0800 (PST) Received: from localhost.localdomain (broadband-46-188-125-142.2com.net. [46.188.125.142]) by mx.google.com with ESMTPSA id e5sm299413laf.44.2014.12.11.03.41.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 11 Dec 2014 03:41:35 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 11 Dec 2014 14:41:28 +0300 Message-Id: <1418298088-14187-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] [PATCH] 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.181 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 --- configure.ac | 2 +- doc/doxygen.cfg | 2 +- m4/ax_prog_doxygen.m4 | 4 ++-- scripts/odp_version.sh | 7 +++++++ 4 files changed, 11 insertions(+), 4 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..1d1dcb6 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 = $(DOC_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..f2ed62f 100644 --- a/m4/ax_prog_doxygen.m4 +++ b/m4/ax_prog_doxygen.m4 @@ -1,4 +1,4 @@ -# =========================================================================== + # http://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html # =========================================================================== # @@ -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(DOC_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..357f017 --- /dev/null +++ b/scripts/odp_version.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +GEN=`grep "define ODP_VERSION_API_GENERATION" platform/linux-generic/include/api/odp_version.h| cut -d ' ' -f 3` +MAJ=`grep "define ODP_VERSION_API_MAJOR" platform/linux-generic/include/api/odp_version.h| cut -d ' ' -f 3` +MIN=`grep "define ODP_VERSION_API_MINOR" platform/linux-generic/include/api/odp_version.h| cut -d ' ' -f 3` + +echo -n $GEN.$MAJ.$MIN