Build: fix the version number for opam releases

Makefile.version

 #
 
-SHA:=`git log -1 --pretty=format:"%h"`
-
-VERSION=$(shell git describe --tags)
+# if it is not a git version, it has to be an opam version!
+SHA:=$(shell git log -1 --pretty=format:"%h" || echo "opam")
+BRANCH:=$(shell git branch | grep "*" | cut -d ' ' -f 2 || basename `pwd` | echo "opam")
+VERSION=$(shell git describe --tags || basename `pwd` | cut -d '.' -f2-4)
 
 echover:
 	echo "VERSION=$(VERSION)"

lutin/src/lutExe.ml

@@ -1913,8 +1913,8 @@ let rec (genpath_ldbg : t -> store -> t CoTraceExp.t -> ctx ->
                            Printf.eprintf
                              "*** TE_dyn_choice : PRGS=%i |tbl|=%i\n"
                              (Random.State.bits (Random.State.copy (Random.get_state ())))
-                             (Obj.reachable_words (Obj.repr t));
-                           (tbl_to_string t); 
+                             (Obj.reachable_words (Obj.repr t))
+                           (* (tbl_to_string t) *); 
                            flush stderr;
                         );
                       if (Random.int sum < wc) then

lutin/src/lutinRun.ml

-(* Time-stamp: <modified the 29/04/2019 (at 15:22) by Erwan> *)
+(* Time-stamp: <modified the 07/05/2019 (at 10:35) by Erwan Jahier> *)
 (**********************************************************************************)
 type vars = (string * Data.t) list
 
@@ -147,7 +147,8 @@ let make argv =
           tables := tbl;
           ctrl_state := cs; data_state := ds;
           Random.set_state prgs;
-        | None  -> Printf.eprintf "Cannot restore state %i from Lutin\n" i; flush stderr 
+        | None  ->
+          Printf.eprintf "Cannot restore state %i from Lutin\n" i; flush stderr 
       );
     init_inputs=mems_in;
     init_outputs=mems_out;