[syntacore] change version specification mechanism

Change-Id: I53e7f1455f21bc9d807876bc44a035d1d0b45b72
Signed-off-by: Evgeniy Naydanov <[email protected]>

Author: en-sc

configure.ac

@@ -110,15 +110,6 @@ AS_IF([test -x "$srcdir/guess-rev.sh"], [
 ])
 AC_MSG_RESULT([$build_release])
 
-# Syntacore has it's own rules for release processing
-AC_MSG_CHECKING([whether to build a release for Syntacore])
-AS_IF([test -r "$srcdir/__sc_version.txt"], [
-  build_syntacore_release=yes
-], [
-  build_syntacore_release=no
-])
-AC_MSG_RESULT([$build_syntacore_release])
-
 # Adapter drivers
 # 1st column -- Basename for the configure option generated with AC_ARG_ENABLE.
 #               For example, "buspirate" generates options "--enable-buspirate[=yes/no]"

src/Makefile.am

@@ -22,23 +22,22 @@ endif
 
 %C%_libopenocd_la_CPPFLAGS =
 
-# this is Syntacore-specific code
-if SYNTACORE_RELEASE
-%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"-`head -1 $(top_srcdir)/__sc_version.txt`\"
-%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`tail -1 $(top_srcdir)/__sc_version.txt`\"
-%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
-else
 # banner output includes RELSTR appended to $VERSION from the configure script
 # guess-rev.sh returns either a repository version ID or "-snapshot"
 if RELEASE
 %C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
 %C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
 else
-%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
-%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+mpy_hints_path = $(top_builddir)/makepy_hints.json
+get_version = "import json; print(json.load(open('$(mpy_hints_path)'))['version'])"
+branch = $$(python -c $(get_version) | cut -d'+' -f2- | tr -c '[:alnum:]\n' _)
+revision = $$(git -C $(top_srcdir) rev-parse HEAD | head -c 8)
+maybe_dirty = $$([ -z "$$(git status --untracked-files=no --porcelain)" ] || echo -dirty)
+%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"-$(branch)-g$(revision)$(maybe_dirty)\"
+riscv_base = $$(git -C $(top_srcdir) merge-base origin/riscv HEAD | head -c 8)
+%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"riscv-upstream-$(riscv_base)-cs-$(revision)$(maybe_dirty)\"
 %C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
 endif
-endif
 
 # add default CPPFLAGS
 %C%_libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)