summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2011-04-29 20:04:14 +0200
committerJim Meyering <meyering@redhat.com>2011-05-18 20:31:42 +0200
commit39213a3bbcfd86c1629c06507bfc4a761f71dbc7 (patch)
tree1ded806298af3fbdc81ce3609d61e45f56d84c03
parent167d1e3125e596479dd994ebc29b833e9fd7e825 (diff)
downloaddiffutils-39213a3bbcfd86c1629c06507bfc4a761f71dbc7.tar.gz
maint: use gnulib's new readme-release module
* bootstrap.conf (gnulib_modules): Add readme-release. (bootstrap_epilogue): Add the recommended perl one-liner. * README-release: Remove file; it is now generated from gnulib. * .gitignore: Add it.
-rw-r--r--.gitignore2
-rw-r--r--README-release83
-rw-r--r--bootstrap.conf2
3 files changed, 4 insertions, 83 deletions
diff --git a/.gitignore b/.gitignore
index b5c2b2c..bef4fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,10 @@
.deps
.dirstamp
.gdb-history
+/ABOUT-NLS
/GNUmakefile
/INSTALL
+/README-release
/aclocal.m4
/config.cache
/config.log
diff --git a/README-release b/README-release
deleted file mode 100644
index e5e14e9..0000000
--- a/README-release
+++ /dev/null
@@ -1,83 +0,0 @@
-Here are most of the steps we (maintainers) follow when making a release.
-
-* start from a clean, up-to-date git directory.
-
- git checkout master; git pull
-
-* Run ./configure && make maintainer-clean
-
-* Ensure that the desired versions of autoconf, automake, etc.
- are in your PATH. See the buildreq list in bootstrap.conf for
- the complete list.
-
-* Ensure that you're on "master" with no uncommitted diffs.
- This should produce no output: git checkout master; git diff
-
-* Run bootstrap one last time. This downloads any new translations:
-
- ./bootstrap
-
-* Pre-release testing:
- Ensure that make check syntax-check succeeds.
-
-* Run "make distcheck"
-
-* Set the date, version number, and release type [stable/alpha/beta] on
- line 3 of NEWS, commit that, and tag the release by running e.g.,
-
- build-aux/do-release-commit-and-tag X.Y stable
-
-* Run the following to create release tarballs. Your choice selects the
- corresponding upload-to destination in the emitted gnupload command.
- The different destinations are specified in cfg.mk. See the definitions
- of gnu_ftp_host-{alpha,beta,stable}.
-
- # "TYPE" must be stable, beta or alpha
- make TYPE
-
-* Test the tarball. copy it to a few odd-ball systems and ensure that
- it builds and passes all tests.
-
-* While that's happening, write the release announcement that you will
- soon post.
-
-Once all the builds and tests have passed,
-
-* Run the gnupload command that was suggested by your "make stable" run above.
-
-* Wait a few minutes (maybe up to 30?) and then use the release URLs to
- download all tarball/signature pairs and use gpg --verify to ensure
- that they're all valid.
-
-* Push the NEWS-updating changes and the new tag:
-
- v=$(cat .prev-version)
- git push origin master tag v$v
-
-* Announce it on Savannah first, so you can include the preferable
- savannah.org announcement link in the email message.
-
- From here:
- https://savannah.gnu.org/projects/diffutils/
- click on the "submit news", then write something like the following:
- (If there is no such button, then enable "News" for the project via
- the Main -> "Select Features" menu item, or via this link:
- https://savannah.gnu.org/project/admin/editgroupfeatures.php?group=diffutils)
-
- Subject: diffutils-X.Y released [stable]
- +verbatim+
- ...paste the announcement here...
- -verbatim-
-
- Then go here to approve it:
- https://savannah.gnu.org/news/approve.php?group=diffutils
-
-* Send the announcement email message.
-
-* After each non-alpha release, update the on-line manual accessible via
-
- http://www.gnu.org/software/diffutils/manual/
-
- by running this:
-
- build-aux/gnu-web-doc-update
diff --git a/bootstrap.conf b/bootstrap.conf
index e00ff2b..7dd289a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -53,6 +53,7 @@ mkstemp
mktime
progname
propername
+readme-release
regex
sh-quote
signal
@@ -141,4 +142,5 @@ bootstrap_epilogue()
m=gnulib-tests/gnulib.mk
sed 's,\.\./\.\.,..,g' $m > $m-t
mv -f $m-t $m
+ perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
}