commit 05345ace5375ae9a980633912315c289c71c9163
from: Thomas Adam <thomas@xteddy.org>
date: Sat Sep 10 16:10:40 2022 UTC

portable: use a release variable for tarballs

When creating a release tarball, use a GOT_RELEASE variable to determine
the version of the release.

commit - b033d7a680ecb16ee6150f33c8ad88f25c93e728
commit + 05345ace5375ae9a980633912315c289c71c9163
blob - 268249a815ad44606f4c2543ab5bcc57e1034c1b
blob + dcc48a947d9bc1a946d8f0bcf2cb48147c7288eb
--- .github/README.md
+++ .github/README.md
@@ -192,6 +192,9 @@ the form:
 Where the suffix of `a`, `b`, 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:
blob - 5c80afd828b701b6bac2520234caac17786a9d65
blob + 11e876c094e50eec8919342191039a9d0c987897
--- README.portable
+++ README.portable
@@ -195,6 +195,9 @@ the form:
 Where the suffix of `a`, `b`, 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:
blob - 7b342a8cacfb85c27715de5d97009ce8d7251ea9
blob + 6b97925ba1372cdb689abb7b67828113bfcce395
--- configure.ac
+++ configure.ac
@@ -7,8 +7,6 @@ AC_INIT([got-portable],
 AC_CONFIG_AUX_DIR(etc)
 AC_CONFIG_SRCDIR([lib/rcsutil.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
-
-GOT_RELEASE=No
 
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
blob - 0f8853f957d7a3aba2d26d9a3b97913d2dc4f3e6
blob + cfc79cf52a39cbe207e27b1985fa30a6e40e1f3a
--- util/got-portable-ver.sh
+++ util/got-portable-ver.sh
@@ -7,9 +7,10 @@
 #		    If it's a developer build, it's left as-is.
 #
 # Intended to be called from configure.ac (via autogen.sh)
+GOT_RELEASE=no
 GOT_PORTABLE_VER=0.75
 
-[ -d ".git" ] || { echo "$GOT_PORTABLE_VER" ; exit ; }
+[ -d ".git" -a "$GOT_RELEASE" = "no" ] || { echo "$GOT_PORTABLE_VER" ; exit ; }
 
 git describe --always --dirty 2>/dev/null || \
 	echo "$GOT_PORTABLE_VER"