"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Omar Polo <op@omarpolo.com>
Subject:
[portable] remove util/got-portable-ver.sh
To:
gameoftrees@openbsd.org
Date:
Sun, 26 Feb 2023 11:54:19 +0100

Download raw body.

Thread
While trying the update of the package for void linux to 0.84 some
issues arised (then fixed in 0.84.1) but the biggest one (from a
porter POV) is that it's currently impossible to tweak configure.ac
and re-gen it with autoreconf from a distribution tarball.

The main issue is that util/got-portable-ver.sh is not shipped in it.
However, I'm failing to see the benefit of it.  It just echoes back
the version and, if GOT_RELEASE is not set, runs git(1) describe.  I'd
prefer not to have the build tied to any VCS (not even got(1) itself),
and so here's my proposal to delete it and just use the version in
AC_INIT.

(there's also the point that some ancient autoconf -- still packaged,
for e.g. on void linux -- don't understand m4_esyscmd_s and fail.)

I've also taken the liberty to update .github/README.md.  (by the way,
it seems to be out-of-sync with README.portable?  I can take a look at
sync'ing it later when we've decided about this.)


diff /home/op/w/got-portable
commit - d82a42838ae079d13ed6f4f08656f376695c1450
path + /home/op/w/got-portable
blob - 98c987a5918be5e34702c57fee238d2732dda753
file + .github/README.md
--- .github/README.md
+++ .github/README.md
@@ -172,11 +172,10 @@ Before creating a new release, check the version of Go
 a `-portable`-specific issue needs addressing, for example.
 
 Before creating a new release, check the version of GoT as found in
-`util/got-portable-ver.sh` -- as `GOT_PORTABLE_VER`:
+`configure.ac`:
 
 ```
-GOT_PORTABLE_VER=0.75
-
+AC_INIT([got-portable], [0.75], ...)
 ```
 
 Here, the *to be released* version of `got-portable` will be `0.75`.
@@ -192,9 +191,6 @@ The variable `GOT_RELEASE` needs be changed to `yes` s
 Where the suffix of `1`, `2`, etc., can be used to denote any sub-releases
 from the `0.75` version.
 
-The variable `GOT_RELEASE` needs be changed to `yes` so that the
-GOT_PORTABLE_VER is asserted correctly.
-
 Once the version is verified, the following should be run from the `linux`
 branch -- and the repository should not have any outstanding modifications to
 the source:
@@ -218,9 +214,8 @@ After that point, the version of `GOT_PORTABLE_VER` in
 
 This can then be pushed out to `gh` and `origin`.
 
-After that point, the version of `GOT_PORTABLE_VER` in
-`util/got-portable-ver.sh` should be changed to the next version, and
-`GOT_RELEASE` should be setg back to `no`.
+After that point, the version in `configure.ac` should be changed to the
+next version.
 
 TODO
 ====
blob - 89a7c731c70d0f4fac33a1c20982276efd43c6ae
file + configure.ac
--- configure.ac
+++ configure.ac
@@ -1,9 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([got-portable],
-	m4_esyscmd_s(util/got-portable-ver.sh),
-	[thomas@xteddy.org])
+AC_INIT([got-portable], [0.84.1], [thomas@xteddy.org])
 AC_CONFIG_AUX_DIR(etc)
 AC_CONFIG_SRCDIR([lib/rcsutil.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
blob - d83f913fa3d4f87de929f8a235929bbd01cfefc1
file + /dev/null
--- util/got-portable-ver.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# got-portable-ver: emits the version of got which is building.
-#		    If this is a release build, then the tag name is chomped
-#		    to remove extraneous git information.
-#
-#		    If it's a developer build, it's left as-is.
-#
-# Intended to be called from configure.ac (via autogen.sh)
-GOT_RELEASE=yes
-GOT_PORTABLE_VER=0.84.1
-
-[ -d ".git" -a "$GOT_RELEASE" = "no" ] || { echo "$GOT_PORTABLE_VER" ; exit ; }
-
-git describe --always --dirty 2>/dev/null || \
-	echo "$GOT_PORTABLE_VER"