From 480ff8adfdc23a03f88ab2796a74a7ecb75975f1 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Thu, 10 Nov 2016 15:17:10 +0100
Subject: [PATCH] Install the manual in the lib install directory.

---
 Makefile              | 10 +++++++++-
 _oasis                |  4 ++--
 src/lustre-v6.mldylib |  3 ++-
 src/lustre-v6.mllib   |  3 ++-
 src/lv6version.ml     |  4 ++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9d80615c..0122ef7f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,11 @@ setup.ml:_oasis
 PROF=--enable-profile
 PROF=--disable-profile
 BINPATH=$(shell dirname `which ocamlc`)/..
+LIBPATH=$(shell ocamlc -where)/../lustre-v6/
 setup.data:setup.ml
 	ocaml setup.ml -configure $(PROF)  --prefix $(BINPATH) --exec-prefix $(BINPATH)
 
-install:
+install:install-man
 	ocaml setup.ml -install
 
 uninstall:
@@ -31,6 +32,13 @@ clean:
 distclean:
 	ocaml setup.ml -distclean
 
+man:
+	cd lv6-ref-man && make
+
+install-man: man
+	cp lv6-ref-man/lv6-ref-man.pdf $(LIBPATH)
+
+
 ###############################
 # for developpers
 include ./Makefile.dev
diff --git a/_oasis b/_oasis
index b66062da..e2683a14 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        lustre-v6
-Version:     1.668
+Version:     1.670
 Synopsis:    The Lustre V6 Verimag compiler
 Description: This package contains:
    (1) lus2lic: the (current) name of the compiler (and interpreter via -exec).
@@ -50,5 +50,5 @@ Library "lustre-v6"
   BuildDepends: str,unix,num,rdbg-plugin (>= 1.51) 
   Install:true
   XMETAEnable: true
-  InternalModules: SocExecValue,SocUtils,Lv6util,Lv6version,Lv6errors,Lxm,Lv6MainArgs,Lv6Verbose,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,L2lCheckKcgKeyWord,L2lWhenOnId
+  InternalModules: SocExecValue,SocUtils,Lv6util,Lv6version,Lv6errors,Lxm,Lv6MainArgs,Lv6Verbose,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,L2lCheckKcgKeyWord,L2lWhenOnId,L2lNoWhenNot
 # Comment se passer de cette liste à la Prevert ?
diff --git a/src/lustre-v6.mldylib b/src/lustre-v6.mldylib
index e8519d4e..4ad02e04 100644
--- a/src/lustre-v6.mldylib
+++ b/src/lustre-v6.mldylib
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 08427847d9f356f6dcae766f4a3bba7a)
+# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe)
 Lus2licRun
 SocExecValue
 SocUtils
@@ -63,4 +63,5 @@ SortActions
 SortActionsExpe
 L2lCheckKcgKeyWord
 L2lWhenOnId
+L2lNoWhenNot
 # OASIS_STOP
diff --git a/src/lustre-v6.mllib b/src/lustre-v6.mllib
index e8519d4e..4ad02e04 100644
--- a/src/lustre-v6.mllib
+++ b/src/lustre-v6.mllib
@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 08427847d9f356f6dcae766f4a3bba7a)
+# DO NOT EDIT (digest: 947c6e5c637ee65500076881d3852ffe)
 Lus2licRun
 SocExecValue
 SocUtils
@@ -63,4 +63,5 @@ SortActions
 SortActionsExpe
 L2lCheckKcgKeyWord
 L2lWhenOnId
+L2lNoWhenNot
 # OASIS_STOP
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 1846eea2..3d806088 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
 (** Automatically generated from Makefile *) 
 let tool = "lus2lic"
 let branch = "master"
-let commit = "668"
-let sha_1 = "35901e970a0c377cc36d6437dcbc61beb8001b54"
+let commit = "670"
+let sha_1 = "c84a83cb0164d9b63917cc5dc2d8bdb869e8fd74"
 let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
 let maintainer = "jahier@imag.fr"
-- 
GitLab