From: Joel Brobecker <brobecker@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@redhat.com>,
Mike Frysinger <vapier@gentoo.org>,
Anthony Green <green@moxielogic.com>
Subject: [commit] Adapt sim to new version number & date locations.
Date: Mon, 24 Jun 2013 23:58:00 -0000 [thread overview]
Message-ID: <1372117546-1639-1-git-send-email-brobecker@adacore.com> (raw)
In-Reply-To: <20130624224138.GC5326@adacore.com>
Hello,
This change is required now that gdb/version.in has been moved to
gdb/common/version.in and now that the date needs to be fetched
from bfd/version.h.
The common and ppc parts were easy to fix, by just doing a reduced
version of what we do for GDB and GDBserver. Moxie, on the other
hand, needs the version info for different reasons, and I prefered
not touching it.
sim/common/ChangeLog:
* create-version.sh: New script. Adapted from
gdb/commong/create-version.sh.
* Make-common.in (version.c): Update rule dependencies,
and re-implement using create-version.sh.
sim/ppc/ChangeLog:
* Makefile.in (srccom): New variable.
(version.c): Update rule dependencies, and re-implement using
sim/common/create-version.sh.
Tested by rebuilding the simulators, and by visually inspecting
the output (version.c file).
Checked in.
--
Joel
---
sim/common/ChangeLog | 7 +++++++
sim/common/Make-common.in | 8 ++------
sim/common/create-version.sh | 33 +++++++++++++++++++++++++++++++++
sim/ppc/ChangeLog | 6 ++++++
sim/ppc/Makefile.in | 8 +++-----
5 files changed, 51 insertions(+), 11 deletions(-)
create mode 100755 sim/common/create-version.sh
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 445a4c0..cc0e9aa 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-24 Joel Brobecker <brobecker@adacore.com>
+
+ * create-version.sh: New script. Adapted from
+ gdb/commong/create-version.sh.
+ * Make-common.in (version.c): Update rule dependencies,
+ and re-implement using create-version.sh.
+
2013-06-21 Nick Clifton <nickc@redhat.com>
* gennltvals.sh: Add msp430 support.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index af73c30..769f782 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -300,12 +300,8 @@ stamp-tvals: gentmap
$(SHELL) $(srcroot)/move-if-change tmp-tmap.c targ-map.c
touch stamp-tvals
-version.c: Makefile ../../gdb/version.in
- rm -f version.c-tmp version.c
- echo '#include "version.h"' >> version.c-tmp
- echo 'const char version[] = "'"`sed q ${srcdir}/../../gdb/version.in`"'";' >> version.c-tmp
- mv version.c-tmp version.c
-
+version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in
+ $(SHELL) $(srccom)/create-version.sh $(srccom) version.c
#
# Rules for building sim-* components. Triggered by listing the corresponding
diff --git a/sim/common/create-version.sh b/sim/common/create-version.sh
new file mode 100755
index 0000000..aaf2ab3
--- /dev/null
+++ b/sim/common/create-version.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Copyright (C) 1989-2013 Free Software Foundation, Inc.
+
+# This file is part of GDB.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Create version.c from version.in.
+# Usage:
+# create-version.sh PATH-TO-COMMON-SIM-SRCDIR OUTPUT-FILE-NAME
+
+srcdir="$1"
+output="$2"
+
+rm -f version.c-tmp $output version.tmp
+date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../../bfd/version.h`
+sed -e "s/DATE/$date/" < $srcdir/../../gdb/common/version.in > version.tmp
+echo '#include "version.h"' >> version.c-tmp
+echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
+mv version.c-tmp $output
+rm -f version.tmp
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 4734587..2f7da02 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-24 Joel Brobecker <brobecker@adacore.com>
+
+ * Makefile.in (srccom): New variable.
+ (version.c): Update rule dependencies, and re-implement using
+ sim/common/create-version.sh.
+
2013-05-03 Hafiz Abid Qadeer <abidh@codesourcery.com>
revert:
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index d7d6689..1652b24 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -21,6 +21,7 @@ default: all
VPATH = @srcdir@
srcdir = @srcdir@
+srccom = $(srcdir)/../common
srcroot = $(srcdir)/../..
prefix = @prefix@
@@ -562,11 +563,8 @@ $(TARGETLIB): tmp-igen tmp-dgen tmp-hw tmp-pk tmp-defines $(LIB_OBJ) $(GDB_OBJ)
$(AR) $(AR_FLAGS) $(TARGETLIB) $(LIB_OBJ) $(GDB_OBJ)
$(RANLIB) $(TARGETLIB)
-version.c: Makefile ../../gdb/version.in
- rm -f version.c-tmp version.c
- echo '#include "version.h"' >> version.c-tmp
- echo 'const char version[] = "'"`sed q ${srcdir}/../../gdb/version.in`"'";' >> version.c-tmp
- mv version.c-tmp version.c
+version.c: Makefile $(srccom)/create-version.sh ../../bfd/version.h ../../gdb/common/version.in
+ $(SHELL) $(srccom)/create-version.sh $(srccom) version.c
version.o: version.c $(version_h)
psim.o: psim.c $(CPU_H) $(IDECODE_H) $(OPTIONS_H) $(TREE_H) $(BFD_H)
--
1.7.10.4
next prev parent reply other threads:[~2013-06-24 23:45 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 17:33 [PATCH v5] don't keep a gdb-specific date Tom Tromey
2013-06-21 18:00 ` Pedro Alves
2013-06-24 14:56 ` Tom Tromey
2013-06-24 19:22 ` Joel Brobecker
2013-06-24 22:41 ` [commit] Fix host_name and target_name generation by common/create-version.sh Joel Brobecker
2013-06-24 22:59 ` [PATCH v5] don't keep a gdb-specific date Joel Brobecker
2013-06-24 23:58 ` Joel Brobecker [this message]
2013-06-25 0:52 ` [commit] Adapt sim to new version number & date locations Mike Frysinger
2013-06-25 1:53 ` Joel Brobecker
2013-06-25 15:51 ` Tom Tromey
2013-06-25 15:57 ` Tom Tromey
2013-06-25 15:46 ` Tom Tromey
2013-06-25 16:01 ` Eli Zaretskii
2013-06-25 15:28 ` Tom Tromey
2013-06-25 16:41 ` Mike Frysinger
2013-06-25 1:08 ` [PATCH v5] don't keep a gdb-specific date Hans-Peter Nilsson
2013-06-25 14:16 ` Tom Tromey
2013-06-25 14:25 ` Joel Brobecker
2013-06-25 14:43 ` Tom Tromey
2013-06-25 15:27 ` Tom Tromey
2013-06-26 11:23 ` sim checkout broken (was: [PATCH v5] don't keep a gdb-specific date) Hans-Peter Nilsson
2013-06-26 16:52 ` sim checkout broken Tom Tromey
2013-06-26 17:58 ` Hans-Peter Nilsson
2013-06-27 3:22 ` Tom Tromey
2013-06-27 4:05 ` Hans-Peter Nilsson
2013-06-27 15:22 ` Tom Tromey
2013-06-27 16:30 ` Tom Tromey
2013-06-27 17:09 ` RFC: move common/version.in to gdb/ (Was: sim checkout broken) Tom Tromey
2013-06-28 3:18 ` Hans-Peter Nilsson
2013-06-28 18:17 ` RFC: move common/version.in to gdb/ Tom Tromey
2013-06-27 17:27 ` sim checkout broken Hans-Peter Nilsson
2013-06-27 8:19 ` Andreas Schwab
2013-06-25 14:50 ` [PATCH v5] don't keep a gdb-specific date Pedro Alves
2013-06-25 14:53 ` Joel Brobecker
2013-06-25 15:01 ` Tom Tromey
2013-06-25 15:14 ` Pedro Alves
2013-06-26 2:45 ` Yao Qi
2013-06-26 16:06 ` Tom Tromey
2013-06-27 2:11 ` Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1372117546-1639-1-git-send-email-brobecker@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=green@moxielogic.com \
--cc=tromey@redhat.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox