13200:new version using git tag latest and timestamp only

Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat@veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index a9e62023f4f49736a7abf75993280c7cb26ec81c..96ccf4855b222423abc5fc416911439feff3ebc2 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -46,12 +46,20 @@ version_from_git() {
     # dev/prerelease, output a version number based on the git log for
     # the current working directory.
     if [[ -n "$ARVADOS_BUILDING_VERSION" ]]; then
-      local git_ts git_hash prefix
-      declare $(format_last_commit_here "git_ts=%ct")
-      echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
-      return
+        echo "$ARVADOS_BUILDING_VERSION"
+        return
+    fi
+
+    $ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
+    local git_ts 
+    if [[ -n "$1" ]] ; then
+        prefix="$1"
+    else
+        prefix="0.1"
     fi
 
+    declare $(format_last_commit_here "git_ts=%ct")
+    echo "$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
 }
 
 nohash_version_from_git() {