Move PRERELEASE to mkit.ini

src/include/build.sh

@@ -172,7 +172,7 @@ get_version() {
     #
     #  1. use VERSION (from config.mk)
     #  2. if we are in git, override the version with last tag
-    #  3. if set, add PRERELEASE (from config.mk) as pre-release ID
+    #  3. if set, add project:prerl (from mkit.ini) as pre-release ID
     #     (afer dash)
     #  4. if we are at a later commit than the last tag, add branch
     #     name and commit sha1 to build metadata (after plus sign)
@@ -184,7 +184,7 @@ get_version() {
     # Examples:
     #
     #     myprog v1.0.7                         # all clear
-    #     myprog v1.0.7-alpha                   # PRERELEASE="alpha"
+    #     myprog v1.0.7-alpha                   # mkit.ini: project:prerl="alpha"
     #     myprog v1.0.7-alpha+g1aef811.master   # ^^ + some commits after
     #     myprog v1.0.7-alpha+gf14fc4f.api2     # ^^ + on a feature branch
     #     myprog v1.0.7-alpha+gf14fc4f.api2.dirty  # ^^ + tree edited
@@ -205,12 +205,12 @@ get_version() {
     # meta-data is to *identify* the code, and provide safe path back
     # to tree; commit refs are already perfect for that.
     #
-    # FIXME:  Using PRERELEASE for release IDs may not be compatible with
+    # FIXME:  Using project:prerl for release IDs may not be compatible with
     #         release strategy implemented in release.sh
     #
     local version=$VERSION
-    local prerl=$PRERELEASE
-    grep ":" <<<"$prerl" && warn "colon in PRERELEASE may corrupt version data: $prerl"
+    local prerl=$(ini 1value project:prerl)
+    grep ":" <<<"$prerl" && warn "colon in project:prerl may corrupt version data: $prerl"
     if git rev-parse HEAD >&/dev/null;
     then    # we are in git repo... so we can get smart
         local latest_tag=$(

src/include/release.sh

@@ -95,7 +95,7 @@ __release() {
     # Span release routines: make a signed tag, check branch
     # and update release branch
     #
-    # FIXME: Using PRERELEASE as build.sh:get_version() does may not be
+    # FIXME: Using project:prerl as build.sh:get_version() does may not be
     #        compatible with this release strategy
     #
     local level=$1

src/mkit.mk

@@ -8,7 +8,6 @@ all: options build
 options:
 	@echo build options:
 	@echo "VERSION  = ${VERSION}"
-	@echo "PRERELEASE = ${PRERELEASE}"
 	@echo "DESTDIR   = ${DESTDIR}"
 	@echo "PREFIX   = ${PREFIX}"