groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 12/12: Scrub references to support for snapshot builds.


From: G. Branden Robinson
Subject: [groff] 12/12: Scrub references to support for snapshot builds.
Date: Wed, 3 Aug 2022 20:40:43 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 4069ab69fb13756dc6b74e67986fc1e448654598
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Aug 3 19:16:39 2022 -0500

    Scrub references to support for snapshot builds.
    
    See previous reversion commit for rationale.
---
 FOR-RELEASE    |  1 -
 INSTALL.REPO   | 49 +++++--------------------------------------------
 README         | 11 +++++------
 doc/webpage.ms | 10 ++--------
 m4/groff.m4    |  2 +-
 5 files changed, 13 insertions(+), 60 deletions(-)

diff --git a/FOR-RELEASE b/FOR-RELEASE
index c90fba899..665301fd9 100644
--- a/FOR-RELEASE
+++ b/FOR-RELEASE
@@ -37,7 +37,6 @@ This file describes how to prepare 'groff' for a new release.
   + NEWS
   + BUG-REPORT
   + arch/mingw/grap2graph.cmd
-  + configure.ac (the fallback for snapshot builds from Savannah/cgit)
   + doc/groff.texi (multiple occurrences)
   + doc/webpage.ms
 
diff --git a/INSTALL.REPO b/INSTALL.REPO
index e6cf192ce..39d54a844 100644
--- a/INSTALL.REPO
+++ b/INSTALL.REPO
@@ -6,11 +6,11 @@
 
 This information supplements the generic installation instructions in
 the file 'INSTALL'.  It is meant for people building from the
-development repository or a snapshot archive produced from it, rather
-than a distribution archive.  Distribution archives include a
-'configure' script, among other files; snapshot archives do not.  If you
-want to start building the 'groff' system using an existing 'configure'
-script, you don't need the information in this file.
+development repository, rather than a distribution archive.
+Distribution archives include a 'configure' script, among other files;
+the repository does not.  If you want to start building the 'groff'
+system using an existing 'configure' script, you don't need the
+information in this file.
 
 Dependencies
 ------------
@@ -53,45 +53,6 @@ Invoke the bootstrap script.
     $ ./bootstrap
 
 
-Bootstrapping from a snapshot archive
--------------------------------------
-
-Obtain groff's supported revision of gnulib and instruct the bootstrap
-script where to find it.
-
-Here is the output of "git submodule" for this groff release.
-
- c8b8f3bbcde37a53cd226f4c9cebd0dde6aca37f gnulib (v0.1-5208-gc8b8f3bbcd)
-
-We therefore do the following.
-
-  $ hash=c8b8f3bbcde37a53cd226f4c9cebd0dde6aca37f
-  $ wget -O gnulib.tar.gz https://git.savannah.gnu.org/cgit/gnulib.git/\
-snapshot/gnulib-$hash.tar.gz
-  $ tar xf gnulib.tar.gz
-
-Before we can proceed, we need to patch a bug in gnulib's
-"git-version-gen" script.
-
---- build-aux/git-version-gen~  2022-06-03 18:34:08.175890973 +0000
-+++ build-aux/git-version-gen   2022-06-03 17:51:02.221945195 +0000
-@@ -189,7 +189,7 @@
-     # Remove the "g" to save a byte.
-     v=`echo "$v" | sed 's/-\([^-]*\)-g\([^-]*\)$/.\1-\2/'`;
-     v_from_git=1
--elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
-+elif test "x$fallback" = x && ! git --version >/dev/null 2>&1; then
-     v=UNKNOWN
- else
-     v=$fallback
-
-Place the foregoing in a file called "../git-version-gen.patch", apply
-it, then run the bootstrap script.
-
-  $ patch -d gnulib-$hash -p0 < ../git-version-gen.patch
-  $ ./bootstrap --gnulib-srcdir=gnulib-$hash
-
-
 What bootstrapping does
 -----------------------
 
diff --git a/README b/README
index 8182c58e2..117cab974 100644
--- a/README
+++ b/README
@@ -7,8 +7,8 @@
 This is the 'groff' document formatting system, a reimplementation and
 extension of the AT&T Unix 'troff' system.  The version number is given
 in the file '.tarball-version' if you are building from a distribution
-archive; otherwise, building from its Git repository or a snapshot
-archive will store it in the file '.version'.
+archive; otherwise, building from its Git repository will store it in
+the file '.version'.
 
 This release includes original implementations (not derived from AT&T
 Unix code) of the 'troff', 'nroff', 'pic', 'eqn', 'tbl', 'refer'
@@ -29,7 +29,7 @@ See the file 'INSTALL.extra' for instructions on how to 
install from a
 distribution archive, such as a release, beta, or release candidate.
 
 The file 'INSTALL.REPO' contains supplementary instructions for building
-directly from a clone of the Git repository or a snapshot archive.
+directly from a clone of the Git repository.
 
 The file 'NEWS' contains a history of user-visible changes to 'groff'.
 
@@ -58,9 +58,8 @@ Administration of the project is done through GNU Savannah.
   https://git.savannah.gnu.org/cgit/groff.git
 
 You can view any commit in isolation, and browse the entire source tree
-or produce a snapshot archive corresponding to its state as of that
-commit.  Click the summary line of the commit message to expose these
-options.
+corresponding to its state as of that commit.  Click the summary line of
+the commit message to expose these options.
 
 Build requirements are discussed in the 'INSTALL.extra' and
 'INSTALL.REPO' files noted above.  'groff' also has runtime
diff --git a/doc/webpage.ms b/doc/webpage.ms
index f5d65449c..8cd3e60f3 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -91,9 +91,6 @@ The current version is 1.23.0 (Autumn 2020).
 To view the git repository in your browser, use
 .URL "http://\:git.savannah.gnu.org/\:cgit/\:groff.git"; \
      "Savannah's cgit interface" .
-.
-There you can also download snapshots;
-simply click on a commit entry line to get the URL.
 
 Additional contributions can be found
 .URL "http://\:groff.ffii.org/\:groff/\:contrib/"; here .
@@ -146,7 +143,7 @@ a release.
 You require a C++ compiler.
 
 The file `INSTALL.REPO' contains supplementary instructions for building
-directly from a clone of the repository or a snapshot tarball.
+directly from a clone of the repository.
 
 The file `NEWS' describes recent user-visible changes to `groff'.
 
@@ -171,8 +168,6 @@ The current development version of `groff' is available 
from a
 
 To view the git repository in your browser, go to its
 .URL http://\:git.savannah.gnu.org/\:cgit/\:groff.git "browser interface" .
-There you can also download snapshots; simply click on a commit entry
-line to get the URL.
 .
 .
 .SH
@@ -193,8 +188,7 @@ bison \[>=] 1.875b or byacc
 .in
 
 Note that `texinfo' and `bison' or `byacc' are required only for building
-from repository sources (either a checked out working copy, or a commit
-snapshot).
+from repository sources (a checked-out working copy).
 They are not required for building from a stable release tarball.
 Also note that the version numbers stated are the minimum supported.
 No version of `texinfo' < 5.0 works, and the original release of `bison'
diff --git a/m4/groff.m4 b/m4/groff.m4
index 1d2c6d435..3d1cb1aee 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -393,7 +393,7 @@ AC_DEFUN([GROFF_PNMTOOLS_CAN_BE_QUIET], [
 # Check whether pnmtops can handle the -nosetpage option.
 #
 # We require this both for grohtml operation and generation of
-# doc/gnu.eps from repository/snapshot archive builds.
+# doc/gnu.eps from repository builds.
 
 AC_DEFUN([GROFF_PNMTOPS_NOSETPAGE], [
   pnmtops_nosetpage="pnmtops $pnmtools_quiet"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]