diff --git a/guides/users/Makefile b/guides/users/Makefile index cee812155b05ab89201363d9d2a71c7e74cb921f..70239830e13814fca9ebcd943ec4902cb191703a 100644 --- a/guides/users/Makefile +++ b/guides/users/Makefile @@ -13,6 +13,10 @@ algo: emacs25 --batch --eval="(add-to-list 'load-path \".\") (add-to-list 'load-path \"./el\")" --eval="(require 'htmlize)" --load=emacs-org.el \ --visit=$*.org --funcall org-html-export-to-html +%.html3:%.org + emacs --batch --eval="(add-to-list 'load-path \".\") (add-to-list 'load-path \"./el\")" --eval="(require 'htmlize)" --load=emacs-org.el \ + --visit=$*.org --funcall org-html-export-to-html + EMACS=emacs25 \ --load=htmlize.el \ --load=el/ob-ocaml.el \ @@ -22,4 +26,4 @@ EMACS=emacs25 \ $(EMACS) --visit=$*.org --funcall org-html-export-to-html --eval "(kill-emacs)" -Q clean: - rm *.html + rm *.html rdbg-session*.ml diff --git a/guides/users/README.org b/guides/users/README.org index 4c2ea13917fc25f94f305a196758732cc5be6784..2da1c52cee4ac42218e459099add43edd70a167a 100644 --- a/guides/users/README.org +++ b/guides/users/README.org @@ -196,7 +196,7 @@ values. In order to enter such input more easily, one can use [[http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/lustre-v6/#outline-container-sec-8][=luciole-rif=]] #+BEGIN_SRC sh -luciole-rif sasa ring.dot --custom-daemon +# luciole-rif sasa ring.dot --custom-daemon #+END_SRC @@ -336,8 +336,8 @@ This make rule (defined in =Makefile= and =../Makefile.inc=) 2. launches =rdbg= with some arguments. =rdbg= then prompts the user to enter one of the folling commands: -#+BEGIN_SRC sh -rdbg -o ring.rif -sut "$(sasa) ring.dot --locally-central-daemon" +#+BEGIN_SRC sh :exports results +rdbg -o ring.rif -sut "sasa ring.dot --locally-central-daemon" [] create a fresh session [q] quit @@ -346,6 +346,8 @@ rdbg -o ring.rif -sut "$(sasa) ring.dot --locally-central-daemon" [/q/s]: #+END_SRC +#+RESULTS: + By default, the first in the list is executed; hence if you press =[Return]= without any command, a fresh session is created. More precisely it creates a =rdbg_session.ml= file, that loads all @@ -375,6 +377,8 @@ $ rdbg [/c/q/s]: #+END_SRC +#+RESULTS: + Typing =[Enter]= will therefore also load the =rdbg_session.ml= file we have just been using. diff --git a/sasa.opam b/sasa.opam index 03f1d9453948546314d539b2ea104aa82d1a4fcc..911122630d200b21266d0175e1e5cf9ccfcd49ed 100644 --- a/sasa.opam +++ b/sasa.opam @@ -23,8 +23,10 @@ depends: [ "dune" { >= "1.11" } "ocamlgraph" "lutils" - "lustre-v6" - "lutin" "rdbg" { >= "1.184" } ] +depopts: [ + "lustre-v6" + "lutin" + ] post-messages: ["The last version can be obtained via (opam repo add) http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository/ "] diff --git a/test/unison/my-rdbg-tuning.ml b/test/unison/my-rdbg-tuning.ml index 1940b0d6b52c78e879fac6c64bc16031a973d0f6..21f0fb43d2e0fe9657e9fe3f9b795db0015d972c 100644 --- a/test/unison/my-rdbg-tuning.ml +++ b/test/unison/my-rdbg-tuning.ml @@ -1,4 +1,15 @@ (* *) + + +let sync sl = + let sl = List.filter (fun (n,v) -> String.length n > 5 && String.sub n 0 5 = "Enab_") sl in + Some (List.map (fun (n,v) -> String.sub n 5 ((String.length n)-5),v) sl) +let _ = + rdbg_mv_hook := Some sync; + rdbg_mv_hook := None; + () +;; + #use "rdbg-cmds.ml";; #use "../sasa-rdbg-cmds.ml";;