commit 977a0ce287b1c45c59f9f8d75d573695abcd3f2a
author Damien George <damien.p.george@gmail.com> Sat May 03 19:02:14 2014 +0100
committer Damien George <damien.p.george@gmail.com> Sat May 03 19:02:14 2014 +0100
tree ba217772826173a09d088569f6b7fda2f92a774c
parent b4bb3fdb9cfcb76fb5b64e0a031a70c807ac7395

py: Print tag/version/git describe in uPy banner.

py/py-version.sh

diff --git a/py/py-version.sh b/py/py-version.sh
index f574b57..5306338 100755
--- a/py/py-version.sh
+++ b/py/py-version.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+git_tag="$(git describe || echo unknown)"
 git_hash="$(git rev-parse --short HEAD 2> /dev/null || echo unknown)"
 git_files_are_clean=1
 # Check if there are any modified files.
@@ -11,6 +12,7 @@
 fi
 cat <<EOF
 // This file was generated by py/py-version.sh
+#define MICROPY_GIT_TAG "${git_tag}"
 #define MICROPY_GIT_HASH "${git_hash}"
 #define MICROPY_BUILD_DATE "$(date '+%Y-%m-%d')"
 EOF

stmhal/pyexec.c

diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c
index 294020c..ded20e1 100644
--- a/stmhal/pyexec.c
+++ b/stmhal/pyexec.c
@@ -155,7 +155,7 @@
 #endif
 
 friendly_repl_reset:
-    stdout_tx_str("Micro Python build " MICROPY_GIT_HASH " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with STM32F405RG\r\n");
+    stdout_tx_str("Micro Python " MICROPY_GIT_TAG " (" MICROPY_GIT_HASH " on " MICROPY_BUILD_DATE "); " MICROPY_HW_BOARD_NAME " with STM32F405RG\r\n");
     stdout_tx_str("Type \"help()\" for more information.\r\n");
 
     // to test ctrl-C

unix/main.c

diff --git a/unix/main.c b/unix/main.c
index e677ff6..3fd6113 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -142,7 +142,7 @@
 }
 
 STATIC void do_repl(void) {
-    printf("Micro Python build " MICROPY_GIT_HASH " on " MICROPY_BUILD_DATE "; UNIX version\n");
+    printf("Micro Python " MICROPY_GIT_TAG " (" MICROPY_GIT_HASH " on " MICROPY_BUILD_DATE "); UNIX version\n");
 
     for (;;) {
         char *line = prompt(">>> ");