codal_port: Generate and use correct versions for uPy and micro:bit.

Signed-off-by: Damien George <damien@micropython.org>

Author: dpgeorge

src/codal_port/Makefile

@@ -14,6 +14,7 @@ QSTR_DEFS = qstrdefsport.h
 # Include py core make definitions.
 include $(TOP)/py/py.mk
 
+MP_VER_FILE = $(HEADER_BUILD)/mpversion.h
 MBIT_VER_FILE = $(HEADER_BUILD)/microbitversion.h
 
 LOCAL_LIB_DIR = ../../lib
@@ -115,8 +116,11 @@ QSTR_GLOBAL_REQUIREMENTS += $(MBIT_VER_FILE)
 all: lib $(MBIT_VER_FILE)
 
 # Rule to build header with micro:bit specific version information.
+# Also rebuild MicroPython version header in correct directory to pick up git hash.
 $(MBIT_VER_FILE): FORCE
-	$(PYTHON) $(TOP)/py/makeversionhdr.py $(MBIT_VER_FILE)
+	(cd $(TOP) && $(PYTHON) py/makeversionhdr.py $(abspath $(MP_VER_FILE)))
+	$(PYTHON) $(TOP)/py/makeversionhdr.py $(MBIT_VER_FILE).pre
+	$(CAT) $(MBIT_VER_FILE).pre | $(SED) s/MICROPY_/MICROBIT_/ > $(MBIT_VER_FILE)
 
 include $(TOP)/py/mkrules.mk
 

src/codal_port/modos.c

@@ -29,17 +29,9 @@
 #include "py/objstr.h"
 #include "ports/nrf/modules/uos/microbitfs.h"
 
-// The microbitversion.h file is generated with the same tool as mpversion.h and
-// defines MICROPY_xxx symbols, so rename them.
-#include "genhdr/microbitversion.h"
-#define MICROBIT_GIT_HASH MICROPY_GIT_HASH
-#define MICROBIT_BUILD_DATE MICROPY_BUILD_DATE
-#undef MICROPY_GIT_TAG
-#undef MICROPY_GIT_HASH
-#undef MICROPY_BUILD_DATE
-
-// Include MicroPython version information.
+// Include MicroPython and micro:bit version information.
 #include "genhdr/mpversion.h"
+#include "genhdr/microbitversion.h"
 
 #define MICROBIT_VERSION \
     "micro:bit v" MICROBIT_RELEASE "+" MICROBIT_GIT_HASH " on " MICROBIT_BUILD_DATE \