From 71300e2c0c24442979a3d01b8423cfaf8ea83003 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Sun, 24 Jun 2018 19:13:01 +0100 Subject: Regenerate configure and pot files with updated binutils version number. --- binutils/ChangeLog | 7 + binutils/README-how-to-make-a-release | 50 +- binutils/configure | 20 +- binutils/po/binutils.pot | 1739 +++++++++++++++++---------------- 4 files changed, 917 insertions(+), 899 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d03bc79..28babb2 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,12 @@ 2018-06-24 Nick Clifton + * README-how-to-make-a-release: Update with experiences from + making 2.31 branch. + * po/binutils.pot: Regenerate. + * configure: Regenerate. + +2018-06-24 Nick Clifton + 2.31 branch created. * NEWS: Add marker for 2.31. diff --git a/binutils/README-how-to-make-a-release b/binutils/README-how-to-make-a-release index 597347d..1f1cc82 100644 --- a/binutils/README-how-to-make-a-release +++ b/binutils/README-how-to-make-a-release @@ -38,8 +38,10 @@ How to perform a release. 4. Create the release branch using: - git tag -a binutils-2_30-branch [e.g. for the 2.30 branch...] - git push --tags origin binutils-2_30-branch + git tag -a binutils-2_31-branch [e.g. for the 2.31 branch...] + Suggested tag note: "The 2.31 branch for the FSF binutils" + + git push --tags origin binutils-2_31-branch 5. Update "BINUTILS_BRANCH" in gdbadmin's crontab: @@ -54,49 +56,53 @@ How to perform a release. If you do not have access to this account, please feel free to ask Joel Brobecker . - 6. Update bfd/configure and bfd/configure.ac on HEAD to indicate - snapshot of the following release. - [make-prerelease.sh command hv + C] - - 7. Rename the current HEAD version entry in Bugzilla, and create a + 6. Rename the current HEAD version entry in Bugzilla, and create a new one. E.g. rename "2.30 (HEAD)" to 2.30, and create "2.31 (HEAD)": https://sourceware.org/bugzilla/editversions.cgi?product=binutils - 8. Update the release number in bfd/version.m4 for the mainline and - the branch. The mainline should have the minor number - incremented, but the branch only needs the point value set to 90 - as the release has not actually happened yet. + 7. Check out the branch sources: + + git clone ssh://sourceware.org/git/binutils-gdb.git -b binutils-2_31-branch 2.31 + + 8. Update bfd/version.m4 on HEAD to indicate that is now a snapshot + of the next release: + + m4_define([BFD_VERSION], [2.31.51]) + + Update the release number in bfd/version.m4 for the the branch. + The branch only needs the point value set to 90 as the release + has not actually happened yet. + + m4_define([BFD_VERSION], [2.30.90]) Regenerate various files on both branch and HEAD by configuring with --enable-maintainer-mode. NB/ Remember to build gold and - gprof. Commit the changes. Make sure that this includes the - .pot files as well as the configure and makefiles. - - 9. Create an initial prerelease: + gprof. Add ChangeLog entries. Commit the changes. Make sure + that this includes the .pot files as well as the configure and + makefiles. - a. Change the version on the branch (bfd/version.m4), regenerate - the files, and check this in. + 8. Create an initial prerelease: - b. Create a source tarball of the branch sources: + a. Create a source tarball of the branch sources: ./src-release -x binutils - c. Build a test target using this tarball. + b. Build a test target using this tarball. - d. Upload the prerelease snapshot to the FTP: + c. Upload the prerelease snapshot to the FTP: scp ../binutils-$version.tar.xz sourceware.org:~ftp/pub/binutils/snapshots ssh sourceware.org md5sum ~ftp/pub/binutils/snapshots/binutils-$version.tar.xz - 10. Send it to the Translation Project: + 9. Send it to the Translation Project: http://translationproject.org/html/maintainers.html Sending mail for one of the POT files is sufficient. - 11. Announce the availability of the snapshot and the branch on the + 10. Announce the availability of the snapshot and the branch on the binutils mailing list. Set a date for when the release will actually happen. Something like: ------------------------------------------------------------------------ diff --git a/binutils/configure b/binutils/configure index fade617..df952c6 100755 --- a/binutils/configure +++ b/binutils/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for binutils 2.30.52. +# Generated by GNU Autoconf 2.69 for binutils 2.31.51. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='binutils' PACKAGE_TARNAME='binutils' -PACKAGE_VERSION='2.30.52' -PACKAGE_STRING='binutils 2.30.52' +PACKAGE_VERSION='2.31.51' +PACKAGE_STRING='binutils 2.31.51' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1371,7 +1371,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures binutils 2.30.52 to adapt to many kinds of systems. +\`configure' configures binutils 2.31.51 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1442,7 +1442,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of binutils 2.30.52:";; + short | recursive ) echo "Configuration of binutils 2.31.51:";; esac cat <<\_ACEOF @@ -1569,7 +1569,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -binutils configure 2.30.52 +binutils configure 2.31.51 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2217,7 +2217,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by binutils $as_me 2.30.52, which was +It was created by binutils $as_me 2.31.51, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4164,7 +4164,7 @@ fi # Define the identity of the package. PACKAGE='binutils' - VERSION='2.30.52' + VERSION='2.31.51' cat >>confdefs.h <<_ACEOF @@ -15508,7 +15508,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by binutils $as_me 2.30.52, which was +This file was extended by binutils $as_me 2.31.51, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15574,7 +15574,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -binutils config.status 2.30.52 +binutils config.status 2.31.51 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/binutils/po/binutils.pot b/binutils/po/binutils.pot index de74776..ddbe06a 100644 --- a/binutils/po/binutils.pot +++ b/binutils/po/binutils.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" -"POT-Creation-Date: 2018-04-30 11:22+0100\n" +"POT-Creation-Date: 2018-06-24 19:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,8 +54,8 @@ msgid "" "\n" msgstr "" -#: addr2line.c:100 ar.c:336 ar.c:373 coffdump.c:473 dlltool.c:3989 -#: dllwrap.c:518 elfedit.c:677 objcopy.c:658 objcopy.c:711 readelf.c:4440 +#: addr2line.c:100 ar.c:340 ar.c:377 coffdump.c:473 dlltool.c:3989 +#: dllwrap.c:518 elfedit.c:677 objcopy.c:658 objcopy.c:711 readelf.c:4449 #: size.c:97 srconv.c:1706 strings.c:668 sysdump.c:648 windmc.c:227 #: windres.c:688 #, c-format @@ -98,230 +98,235 @@ msgstr "" msgid "unknown demangling style `%s'" msgstr "" -#: ar.c:257 +#: ar.c:260 #, c-format msgid "no entry %s in archive\n" msgstr "" -#: ar.c:271 +#: ar.c:274 #, c-format msgid "" -"Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [--plugin " +"Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [--plugin " "] [member-name] [count] archive-file file...\n" msgstr "" -#: ar.c:277 +#: ar.c:280 #, c-format msgid "" -"Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoPsSTuvV] [member-name] " -"[count] archive-file file...\n" +"Usage: %s [emulation options] [-]{dmpqrstx}[abcDfilMNoOPsSTuvV] [member-" +"name] [count] archive-file file...\n" msgstr "" -#: ar.c:285 +#: ar.c:288 #, c-format msgid " %s -M [ - read options from \n" msgstr "" -#: ar.c:325 +#: ar.c:329 #, c-format msgid " --target=BFDNAME - specify the target object format as BFDNAME\n" msgstr "" -#: ar.c:327 +#: ar.c:331 #, c-format msgid " optional:\n" msgstr "" -#: ar.c:328 +#: ar.c:332 #, c-format msgid " --plugin

- load the specified plugin\n" msgstr "" -#: ar.c:349 +#: ar.c:353 #, c-format msgid "Usage: %s [options] archive\n" msgstr "" -#: ar.c:350 +#: ar.c:354 #, c-format msgid " Generate an index to speed access to archives\n" msgstr "" -#: ar.c:351 +#: ar.c:355 #, c-format msgid "" " The options are:\n" " @ Read options from \n" msgstr "" -#: ar.c:354 +#: ar.c:358 #, c-format msgid " --plugin Load the specified plugin\n" msgstr "" -#: ar.c:358 +#: ar.c:362 #, c-format msgid "" " -D Use zero for symbol map timestamp (default)\n" " -U Use an actual symbol map timestamp\n" msgstr "" -#: ar.c:362 +#: ar.c:366 #, c-format msgid "" " -D Use zero for symbol map timestamp\n" " -U Use actual symbol map timestamp (default)\n" msgstr "" -#: ar.c:365 +#: ar.c:369 #, c-format msgid "" " -t Update the archive's symbol map timestamp\n" @@ -329,101 +334,101 @@ msgid "" " -v --version Print version information\n" msgstr "" -#: ar.c:489 +#: ar.c:493 msgid "two different operation options specified" msgstr "" -#: ar.c:580 ar.c:640 nm.c:1764 +#: ar.c:587 ar.c:647 nm.c:1764 #, c-format msgid "sorry - this program has been built without plugin support\n" msgstr "" -#: ar.c:770 +#: ar.c:777 msgid "no operation specified" msgstr "" -#: ar.c:773 +#: ar.c:780 msgid "`u' is only meaningful with the `r' option." msgstr "" -#: ar.c:776 +#: ar.c:783 msgid "`u' is not meaningful with the `D' option." msgstr "" -#: ar.c:779 +#: ar.c:786 msgid "`u' modifier ignored since `D' is the default (see `U')" msgstr "" -#: ar.c:788 +#: ar.c:795 msgid "missing position arg." msgstr "" -#: ar.c:794 +#: ar.c:801 msgid "`N' is only meaningful with the `x' and `d' options." msgstr "" -#: ar.c:796 +#: ar.c:803 msgid "`N' missing value." msgstr "" -#: ar.c:799 +#: ar.c:806 msgid "Value for `N' must be positive." msgstr "" -#: ar.c:815 +#: ar.c:822 msgid "`x' cannot be used on thin archives." msgstr "" -#: ar.c:862 +#: ar.c:869 #, c-format msgid "internal error -- this option not implemented" msgstr "" -#: ar.c:931 +#: ar.c:938 #, c-format msgid "creating %s" msgstr "" -#: ar.c:962 +#: ar.c:969 #, c-format msgid "Cannot convert existing library %s to thin format" msgstr "" -#: ar.c:968 +#: ar.c:975 #, c-format msgid "Cannot convert existing thin library %s to normal format" msgstr "" -#: ar.c:1000 ar.c:1064 ar.c:1394 objcopy.c:3297 +#: ar.c:1007 ar.c:1071 ar.c:1401 objcopy.c:3297 #, c-format msgid "internal stat error on %s" msgstr "" -#: ar.c:1019 ar.c:1097 +#: ar.c:1026 ar.c:1104 #, c-format msgid "%s is not a valid archive" msgstr "" -#: ar.c:1056 objcopy.c:3261 +#: ar.c:1063 objcopy.c:3261 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "" -#: ar.c:1155 +#: ar.c:1162 msgid "could not create temporary file whilst writing archive" msgstr "" -#: ar.c:1299 +#: ar.c:1306 #, c-format msgid "No member named `%s'\n" msgstr "" -#: ar.c:1349 +#: ar.c:1356 #, c-format msgid "no entry %s in archive %s!" msgstr "" -#: ar.c:1488 +#: ar.c:1495 #, c-format msgid "%s: no archive map to update" msgstr "" @@ -553,32 +558,32 @@ msgstr "" msgid "