info patchlevel: now returns git version if available

e.g.

. info patchlevel
0.83-35-g8a438c3-dirty

Fixes #297

Signed-off-by: Steve Bennett <steveb@workware.net.au>

3 files changed, 21 insertions, 7 deletions

diff --git a/auto.def b/auto.def
index 1afb7d3..94c4073 100644
--- a/auto.def
+++ b/auto.def
@@ -31,7 +31,7 @@ options {
     taint=1         => "Disable taint support"
     extinfo         => "Show information about available extensions"
     with-jim-shared shared => "Build a shared library instead of a static library"
-    jim-regexp=1    => "Prefer POSIX regex if over the the built-in (Tcl-compatible) regex"
+    jim-regexp=1    => "Prefer POSIX regex over the the built-in (Tcl-compatible) regex"
     docs=1          => "Don't build or install the documentation"
     docdir:path     => "Path to install docs (if built)"
     random-hash     => "Randomise hash tables. more secure but hash table results are not predicable"
@@ -499,6 +499,11 @@ if {[opt-bool shared with-jim-shared]} {
     define JIM_STATICLIB
 }
 define VERSION [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]
+set githash [get-define VERSION]
+catch {
+    set githash [exec git describe --dirty]
+}
+define JIM_GITVERSION $githash
 define LIBSOEXT [format [get-define SH_SOEXTVER] [get-define VERSION]]
 if {[get-define libdir] ni {/lib /usr/lib /usr/lib64}} {
     define SH_LINKRPATH_FLAGS [format [get-define SH_LINKRPATH] [get-define libdir]]
@@ -669,7 +674,7 @@ foreach mod $extinfo(module-c) {
 }
 define BUILD_SHOBJS [join $lines \n]
 
-make-config-header jim-config.h -auto {HAVE_LONG_LONG* JIM_UTF8 JIM_TAINT SIZEOF_INT} -bare JIM_VERSION -none *
+make-config-header jim-config.h -auto {HAVE_LONG_LONG* JIM_UTF8 JIM_TAINT JIM_GITVERSION SIZEOF_INT} -bare JIM_VERSION -none *
 make-config-header jimautoconf.h -auto {jim_ext_* TCL_PLATFORM_* TCL_LIBRARY USE_* JIM_* _FILE_OFFSET*} -bare {S_I*}
 make-template Makefile.in
 make-template tests/Makefile.in
diff --git a/jim.c b/jim.c
index e8469ce..03f5d64 100644
--- a/jim.c
+++ b/jim.c
@@ -16120,12 +16120,17 @@ static int Jim_InfoCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
                 return JIM_OK;
             }
 
-        case INFO_VERSION:
-        case INFO_PATCHLEVEL:{
-                char buf[(JIM_INTEGER_SPACE * 2) + 1];
+        case INFO_PATCHLEVEL:
+           /* bootstrap jimsh doesn't have this so fall through */
+#ifdef JIM_GITVERSION
+            Jim_SetResultString(interp, JIM_GITVERSION, -1);
+            return JIM_OK;
+#endif
 
-                sprintf(buf, "%d.%d", JIM_VERSION / 100, JIM_VERSION % 100);
-                Jim_SetResultString(interp, buf, -1);
+        case INFO_VERSION:{
+                char versionbuf[64];
+                snprintf(versionbuf, sizeof(versionbuf), "%d.%d", JIM_VERSION / 100, JIM_VERSION % 100);
+                Jim_SetResultString(interp, versionbuf, -1);
                 return JIM_OK;
             }
 
diff --git a/jim_tcl.txt b/jim_tcl.txt
index 6975401..71dc35a 100644
--- a/jim_tcl.txt
+++ b/jim_tcl.txt
@@ -3034,6 +3034,10 @@ The legal +'option'+'s (which may be abbreviated) are:
     was invoked. A full path will be returned, unless the path
     can't be determined, in which case the empty string will be returned.
 
++*info patchlevel*+::
+    Returns the build (git) version if available. Otherwise
+    returns the same as `info version`.
+
 +*info procs ?-all?* ?'pattern'?+::
     Returns a list containing the names of Tcl command procedures.
     See `info commands` for the meaning of +*-all*+ and +'pattern'+.