hostside: include autoversion and print it in a couple of relevant places

diff --git a/hostside/.gitignore b/hostside/.gitignore
index f796ab5a114da89227960c17dd02cb5a1f838756..7238cd84eba1a8cc48ef170f668976c1e90c8170 100644 (file)
--- a/hostside/.gitignore
+++ b/hostside/.gitignore
@@ -21,6 +21,7 @@ record-y.[ch]
 +persist*
 .lock
 +*.log
+*+autoversion.c
 +realtime.stderr
 *+dflags.h
 *.new

diff --git a/hostside/Makefile b/hostside/Makefile
index 7cb9e5233fd64925e8955fcc8d7045fb49a3897f..4124cd516a90e7488cd003218340c0324931888f 100644 (file)
--- a/hostside/Makefile
+++ b/hostside/Makefile
@@ -54,6 +54,12 @@ REALTIME_CORE=       realtime startup safety trackloc                \
 REALTIME_CORE_OBJS= $(addsuffix .o, $(REALTIME_CORE))
 
 realtime:      $(REALTIME_CORE_OBJS) $(LIBOOP_OBJS) -lm
+               ../.git-revid C >$@+autoversion.c.new
+               @set -x; if ! cmp $@+autoversion.c.new $@+autoversion.c; then \
+                       mv $@+autoversion.c.new $@+autoversion.c; \
+                       $(CC) $(CFLAGS) -c $@+autoversion.c; \
+               fi
+               $(CC) $(LDFLAGS) $@+autoversion.o $^ $(LDLIBS) -o $@
 
 #---------- other targets ----------
 

diff --git a/hostside/TODO b/hostside/TODO
index d44360dbdfc877275d89025248005da9a8718933..dec646e31210cceddbdd55eeb8caef79edfdec8f 100644 (file)
--- a/hostside/TODO
+++ b/hostside/TODO
@@ -1,7 +1,6 @@
 
 multiplex should have restart loop limiting
 why did removing +persist.* not fix it
-version number should be reported / preserved somehow
 should expire dumps, eventually
 want realtime kernel for bessar
 

diff --git a/hostside/persist.c b/hostside/persist.c
index 83aa147eb25df16f5c2d70ccb282e8551dd34808..7e67d99a952c23ee17a175df6be04bf9b4c18fc0 100644 (file)
--- a/hostside/persist.c
+++ b/hostside/persist.c
@@ -375,6 +375,8 @@ void persist_entrails_run_converter(void) {
   SEG_IV;
   MovPosComb report;
 
+  printf("# %s\n", autoversion);
+
   persist_mapread();
 
   FOR_SEG {

diff --git a/hostside/realtime.c b/hostside/realtime.c
index e56b4cfa4e1df4f1a4bc4a8c4ca99935d73bf989..46f6c06ffe830c322c97a72b1f52770d17a23e68 100644 (file)
--- a/hostside/realtime.c
+++ b/hostside/realtime.c
@@ -577,6 +577,7 @@ int main(int argc, const char **argv) {
     sys_events= 0;
   }
 
+  ouprintf("info version : %s\n", autoversion);
   persist_entrails_interpret();
   records_parse(argv);
   realtime_priority();

diff --git a/hostside/realtime.h b/hostside/realtime.h
index 3624c754a72e7c2fb3f13bbf85723975d16f0dfe..02635a0288ee7445926eb409f95682f610183698 100644 (file)
--- a/hostside/realtime.h
+++ b/hostside/realtime.h
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
+#include "../.git-revid-autoversion.h"
 #include "../layout/layout-data.h"
 #include "realtime+dflags.h"