From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-102835-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 19852 invoked by alias); 25 Jun 2013 15:57:30 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 19706 invoked by uid 89); 25 Jun 2013 15:57:28 -0000
X-Spam-SWARE-Status: No, score=-6.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.1
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28)    by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 25 Jun 2013 15:57:28 +0000
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5PFvKUq023799	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Tue, 25 Jun 2013 11:57:20 -0400
Received: from barimba (ovpn-113-102.phx2.redhat.com [10.3.113.102])	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5PFvHn2013879	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);	Tue, 25 Jun 2013 11:57:18 -0400
From: Tom Tromey <tromey@redhat.com>
To: Joel Brobecker <brobecker@adacore.com>
Cc: Mike Frysinger <vapier@gentoo.org>, gdb-patches@sourceware.org,        Anthony Green <green@moxielogic.com>,        Pierre Muller <pierre.muller@ics-cnrs.unistra.fr>
Subject: Re: [commit] Adapt sim to new version number & date locations.
References: <20130624224138.GC5326@adacore.com>	<1372117546-1639-1-git-send-email-brobecker@adacore.com>	<201306242040.08030.vapier@gentoo.org>	<20130625010802.GE5326@adacore.com> <87y59yry5j.fsf@fleche.redhat.com>
Date: Tue, 25 Jun 2013 15:57:00 -0000
In-Reply-To: <87y59yry5j.fsf@fleche.redhat.com> (Tom Tromey's message of "Tue,	25 Jun 2013 09:46:32 -0600")
Message-ID: <87mwqerxnm.fsf@fleche.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-SW-Source: 2013-06/txt/msg00720.txt.bz2

Tom> I'm working on update-web-ari.sh.

Here it is.
Let me know what you think.

Tom

2013-06-25  Tom Tromey  <tromey@redhat.com>

	* contrib/ari/update-web-ari.sh: Update for version.in change.

diff --git a/gdb/contrib/ari/update-web-ari.sh b/gdb/contrib/ari/update-web-ari.sh
index ee331e4..f64c168 100644
--- a/gdb/contrib/ari/update-web-ari.sh
+++ b/gdb/contrib/ari/update-web-ari.sh
@@ -102,7 +102,7 @@ then
   aridir=${srcdir}/${module}/contrib/ari
   unpack_source_p=false
   delete_source_p=false
-  version_in=${srcdir}/${module}/version.in
+  version_in=${srcdir}/${module}/common/version.in
 else
   # unpack the tar-ball
   if ${unpack_source_p}
@@ -132,7 +132,7 @@ else
   module=`basename ${module} .tar`
   srcdir=`echo ${tmpdir}/${module}*`
   aridir=${HOME}/ss
-  version_in=${srcdir}/gdb/version.in
+  version_in=${srcdir}/gdb/common/version.in
 fi
 
 if [ ! -r ${version_in} ]
@@ -140,8 +140,9 @@ then
     echo ERROR: missing version file 1>&2
     exit 1
 fi
-version=`cat ${version_in}`
 
+bfdver=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/bfd/version.h`
+version=`sed -e "s/DATE/$date/" < ${version_in}`
 
 # THIS HAS SUFFERED BIT ROT
 if ${check_warning_p} && test -d "${srcdir}"