[Octave-bug-tracker] [bug #57044] Use `bootstrap` without hg subrepo and proper revision control

[Kai Torben Ohlhus]

Update of bug #57044 (project octave):

              Item Group:                   Other => Feature Request        
                  Status:                    None => Ready For Test         
                 Summary: gitlab mirror: "bootstrap --no-git requires
--gnulib-srcdir" => Use `bootstrap` without hg subrepo and proper revision
control

    _______________________________________________________

Follow-up Comment #10:

During the preparation for the 6.1 release, I stumbled over this issue again. 
gnulib does not make it easy to understand the bootstrap script.  But
basically all that is said in the bootstrap file.  Octave does currently not
make use of the


GNULIB_REVISION=03eccb2d010e0755fd55458e2f012fcfb0735c2d


https://hg.octave.org/gnulib/rev/c34f677e6117

https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=03eccb2d010e0755fd55458e2f012fcfb0735c2d

feature.  I tried around with it:

+ Works offline (if the revision is fetched inside the git repo).
+ Works with self-hosted gnulib-git repo (git version managed by bootstrap,
"--gnulib-srcdir" and "GNULIB_SRCDIR" are dominant)
- `git` becomes a new build requirement (honestly, today not a drawback at
all)

With this approach, updating gnulib is now as easy as changing the hash in
bootstrap.conf


GNULIB_REVISION=ff29c880629e73def7cd6c4a954e919b174d31b6


and run before committing to the Octave hg repo:


./bootstrap --bootstrap-sync


No more hg subrepo in Octave!! =D

The attached short changeset should be used with a clean clone of Octave and
automatically cloned the "gnulib" repo removed:


diff -r 1d04f049a859 -r 1a63b0fbafd3 .hgsub
--- a/.hgsub    Tue Dec 10 17:55:29 2019 -0800
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnulib = http://hg.octave.org/gnulib
diff -r 1d04f049a859 -r 1a63b0fbafd3 .hgsubstate
--- a/.hgsubstate       Tue Dec 10 17:55:29 2019 -0800
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-c34f677e6117d1c293338328a6c9b9ce18e9ef53 gnulib
diff -r 1d04f049a859 -r 1a63b0fbafd3 bootstrap.conf
--- a/bootstrap.conf    Tue Dec 10 17:55:29 2019 -0800
+++ b/bootstrap.conf    Wed Dec 11 14:39:32 2019 +0900
@@ -176,10 +176,15 @@ gnulib_tool_option_extras="--libtool"
 gnulib_name="libgnu"
 source_base="libgnu"
 
-# Don't use git to update gnulib sources. We keep gnulib under a
-# Mercurial subrepository instead.
-use_git=false
-GNULIB_SRCDIR=gnulib
+# Go to https://git.savannah.gnu.org/cgit/gnulib.git to find out the latest
+# revision ID.  Paste it below and run
+#
+#   ./bootstrap --bootstrap-sync
+#
+# To update the ./bootstrap file with that from ./gnulib/build-aux/bootstrap
+#
+GNULIB_REVISION=ff29c880629e73def7cd6c4a954e919b174d31b6
+
 
 # Don't check for translations since we don't have any in Octave yet.
 # This avoids the need for sha1sum or compatible utility in bootstrap.



(file #48044)
    _______________________________________________________

Additional Item Attachment:

File name: bug_57044_remove_hg_gnulib.patch Size:1 KB
   
<https://savannah.gnu.org/file/bug_57044_remove_hg_gnulib.patch?file_id=48044>



    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?57044>

_______________________________________________
  Message sent via Savannah
  https://savannah.gnu.org/