diff --git a/INSTALL.txt b/INSTALL.txt
index 6f337982aa1178f04aca552ceb1395a05b3c9617..b5ca2731989912c3d75dc44b4a738123c032004c 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,5 +1,5 @@
(* OASIS_START *)
-(* DO NOT EDIT (digest: 309bbc8b0d4bd6d778884c99a792df48) *)
+(* DO NOT EDIT (digest: 512dbf0dbc8375e376976d422e55665d) *)
This is the INSTALL file for the lustre-v6 distribution.
@@ -15,7 +15,7 @@ In order to compile this package, you will need:
* findlib
* lutils for executable lv6, executable lv6.dbg
* extlib for executable lv6, executable lv6.dbg
-* rdbg-plugin (>= 1.177) for library lustre-v6
+* rdbg for library lustre-v6
Installing
==========
diff --git a/Makefile.dev b/Makefile.dev
index 38a26d991826fa319130d757a2f6fc5659a77faa..b0ffcde9436ac3c109a8371162e62b7c6f930607 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -72,3 +72,12 @@ opam-test :
+###############################
+# pushing onto the official repo
+WWW="/import/www/DIST-TOOLS/SYNCHRONE"
+OPAM_FILE=$(shell find $(WWW)/opam-repository/packages/$(NAME) -name opam -cnewer opam | head -1 | sed -e 's/^./\U&/')
+OPAM_DIR=`dirname $(OPAM_FILE)`
+
+opam-pr:
+ cp -r $(OPAM_DIR) /home/jahier/local/opam-repository/packages/$(NAME)
+
diff --git a/_oasis b/_oasis
index 454ad102693fca0453687b7ccb61588f16c38a08..25bbda3e30d916b2a0f444f84aa6032999c4b0c2 100644
--- a/_oasis
+++ b/_oasis
@@ -54,7 +54,7 @@ Library "lustre-v6"
Modules: Lv6Run
Path: src/
BuildTools: ocamlbuild
- BuildDepends: str,unix,num,rdbg-plugin (>= 1.177)
+ BuildDepends: str,unix,num,rdbg
Install:true
XMETAEnable: true
InternalModules: SocExecValue,SocUtils,Lv6util,Lv6version,Lv6errors,Lxm,Lv6MainArgs,Lv6Verbose,Soc2cIdent,Soc,SocPredef,Lv6Id,SocExecDbg,SocExec,SocExecEvalPredef,Lv6Compile,AstTab,AstTabSymbol,AstInstanciateModel,Lv6parserUtils,AstV6,FilenameExtras,LicTab,LicDump,AstPredef,Lic,AstCore,FreshName,IdSolver,EvalConst,LicEvalConst,LicEvalType,UnifyType,Ast2lic,AstV6Dump,EvalClock,UnifyClock,LicEvalClock,EvalType,LicPrg,LicMetaOp,L2lCheckOutputs,Lv6Misc,L2lRmPoly,L2lExpandMetaOp,L2lSplit,L2lExpandNodes,L2lExpandArrays,L2lCheckLoops,L2lCheckMemSafe,L2lOptimIte,Lv6lexer,Lv6parser,AstRecognizePredef,Lic2soc,Action,ActionsDeps,SocVar,TopoSort,SortActions,SortActionsExpe,L2lCheckCKeyWord,L2lCheckKcgKeyWord,L2lWhenOnId,L2lNoWhenNot,L2lRemoveAlias,L2lExpandEnum,Dbg
diff --git a/_tags b/_tags
index 700f2a62172a9b85afc9eda7df89412df844bb80..dff3a5ba55d70ba51d340f136f7d9a5bf56779f3 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 1bbce7c5352daeb22141220fb1394d4f)
+# DO NOT EDIT (digest: ea1baf54d8f4bef461ce90069a0bac28)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -31,7 +31,7 @@ true: annot, bin_annot
# Library lustre-v6
"src/lustre-v6.cmxs": use_lustre-v6
<src/*.ml{,i,y}>: package(num)
-<src/*.ml{,i,y}>: package(rdbg-plugin)
+<src/*.ml{,i,y}>: package(rdbg)
<src/*.ml{,i,y}>: package(str)
<src/*.ml{,i,y}>: package(unix)
# OASIS_STOP
diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf
index fc1772e1061508d604a186c13ea6f9c6953836e4..daf54bee84fc2ee25557657c85c8c7d024f3f7ee 100644
Binary files a/lv6-ref-man/lv6-ref-man.pdf and b/lv6-ref-man/lv6-ref-man.pdf differ
diff --git a/opam b/opam
deleted file mode 100644
index c2433c9c0c92b918e416f0320db0b2ea359cac6a..0000000000000000000000000000000000000000
--- a/opam
+++ /dev/null
@@ -1,29 +0,0 @@
-opam-version: "1.2"
-maintainer: "erwan.jahier@univ-grenoble-alpes.fr"
-authors: [ "Erwan Jahier and Pascal Raymond" ]
-license: "CeCILL"
-homepage: "http://www-verimag.imag.fr/lustre-v6.html"
-dev-repo: "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lustre-v6.git"
-bug-reports: "http://www-verimag.imag.fr/lustre-v6.html"
-build: [make "build"]
-install: [make "install"]
-remove: [
- ["ocaml" "%{etc}%/lustre-v6/setup.ml" "-C" "%{etc}%/lustre-v6" "-uninstall"]
-]
-build-test: [
- ["oasis" "setup"]
- ["ocaml" "setup.ml" "-configure" "--enable-tests"]
- ["ocaml" "setup.ml" "-build"]
- ["ocaml" "setup.ml" "-test"]
-]
-depends: [
- "base-unix"
- ("extlib" {build} | "extlib-compat" {build})
- "lutils"
- ("oasis" {build & >= "0.4.7"} | "oasis-mirage" {build & >= "0.4.7"})
- "ocamlbuild" {build}
- "ocamlfind"
- "rdbg" {>= "1.177"}
-]
-available: [ ocaml-version >= "4.02" ]
-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/lus2lic.sum b/test/lus2lic.sum
index 852c0c40c9c95ceb112a5543085850f131093d76..f5fd226d9dc7329aee4b2fd5994d4aa7bee4c150 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test run by jahier on Fri Aug 2 13:46:08
+Test run by jahier on Thu Aug 29 11:04:07
Native configuration is x86_64-pc-linux-gnu
=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
==> lus2lic1.sum <==
-Test run by jahier on Fri Aug 2 13:46:09
+Test run by jahier on Thu Aug 29 11:04:08
Native configuration is x86_64-pc-linux-gnu
=== lus2lic1 tests ===
@@ -409,7 +409,7 @@ PASS: sh multipar.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
==> lus2lic2.sum <==
-Test run by jahier on Fri Aug 2 13:46:30
+Test run by jahier on Thu Aug 29 11:04:33
Native configuration is x86_64-pc-linux-gnu
=== lus2lic2 tests ===
@@ -749,7 +749,7 @@ PASS: sh zzz2.sh
PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {}
==> lus2lic3.sum <==
-Test run by jahier on Fri Aug 2 13:46:56
+Test run by jahier on Thu Aug 29 11:05:04
Native configuration is x86_64-pc-linux-gnu
=== lus2lic3 tests ===
@@ -1259,7 +1259,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test run by jahier on Fri Aug 2 13:47:34
+Test run by jahier on Thu Aug 29 11:05:47
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
@@ -1777,13 +1777,13 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
===============================
# Total number of failures: 69
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 21 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 26 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 38 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 14 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 25 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 31 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 42 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 15 seconds
* Ref time:
-50.69user 17.84system 1:39.60elapsed 68%CPU (0avgtext+0avgdata 273248maxresident)k
-0inputs+137480outputs (0major+10946101minor)pagefaults 0swaps
+60.59user 21.77system 1:55.21elapsed 71%CPU (0avgtext+0avgdata 272980maxresident)k
+0inputs+139624outputs (0major+11745984minor)pagefaults 0swaps
* Quick time (-j 4):
-58.09user 19.56system 0:53.91elapsed 144%CPU (0avgtext+0avgdata 272756maxresident)k
-4872inputs+136544outputs (4major+10883627minor)pagefaults 0swaps
+68.03user 22.69system 1:25.71elapsed 105%CPU (0avgtext+0avgdata 272704maxresident)k
+0inputs+133048outputs (0major+11267876minor)pagefaults 0swaps