Commit 6a277aeb authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Add the seed (back!) into the rif file generated by lurettetop

Also, install the manual in the lib install directory.
parent 3370a094
......@@ -19,6 +19,10 @@ dllcamlidl.so:$(STUBLIBS)/dllcamlidl.so
$(STUBLIBS)/dllcamlidl.so: $(CAMLIDL)/dllcamlidl.so
cp $< $@
fix_camlidl_meta: $(CAMLIDL)/META
cat $(CAMLIDL)/META | sed s/archive\(byte\)/archive\(byte,plugin\)/ > $(CAMLIDL)/META-new
mv $(CAMLIDL)/META-new $(CAMLIDL)/META
# Some more clutches because oasis does not support camlidl
polka/vector.ml: polka/vector.idl
......@@ -28,7 +32,7 @@ lutin-utils/src/lutinutils.ml: lutin-utils/src/lutinUtils.idl
cd lutin-utils/src/; make
###################################################
build: setup.data $(CAMLIDL)/dllcamlidl.so
build: setup.data $(CAMLIDL)/dllcamlidl.so fix_camlidl_meta
ocaml setup.ml -build
setup.ml:_oasis lutin/src/version.ml polka/vector.ml lutin-utils/src/lutinutils.ml
......@@ -36,6 +40,7 @@ setup.ml:_oasis lutin/src/version.ml polka/vector.ml lutin-utils/src/lutinutils.
BINPATH=$(shell dirname `which ocamlc`)/..
LIBPATH=$(shell shell ocamlc -where)/../lutin/
setup.data:configure
configure: setup.ml
ocaml setup.ml -configure --prefix $(BINPATH) --exec-prefix $(BINPATH)
......@@ -44,7 +49,14 @@ configure: setup.ml
doc:
ocaml setup.ml -doc
install:
man:
cd doc/lutin-man/ && make
install-man:
cp doc/lutin-man/lutin-man.pdf $(LIBPATH)
install:
ocaml setup.ml -install
cp lutin/src/lut4c_stubs.h $(shell ocamlc -where)/../lutin/
......
OASISFormat: 0.4
Name: Lutin
Version: 2.11
Version: 2.12
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: PROP
......@@ -124,3 +124,15 @@ Executable "call-via-socket"
Build: true
Install:true
CompiledObject: native
# XXX not working
Document "lutin-man.pdf"
Title: Lutin language reference manual
Type: custom (0.4)
DataFiles: doc/lutin-man/lutin-man.pdf
XCustom: make
InstallDir: $docdir
Build: true
Install: true
BuildTools: make
XOCamlbuildPath: doc/lutin-man
/home/raymond/git/petitzoutils/yacc2tex/_build-linux64/src/rules2tex.native
\ No newline at end of file
......@@ -480,6 +480,8 @@ let (start : unit -> Event.t) =
Rif.write oc ("# This is lurette Version " ^ Version.str ^
" (\"" ^Version.sha^"\")\n");
Rif.write oc ("#seed "^(string_of_int seed)^"\n");
RifIO.write_interface oc
(luciole_outputs_vars@flat_env_out) flat_sut_out loc (Some oracle_out_l);
Rif.flush oc;
......
......@@ -614,7 +614,7 @@ let (draw_point_cheap2 : point list -> point) =
The result is not too bad, but not perfect...
*)
let ul0 = List.map (fun _ -> Random.float 1.0) (List.tl zl) in
let ul = Sort.list (fun x y -> x < y) ul0 in
let ul = List.sort compare ul0 in
let (u_last, sl0) =
List.fold_left
(fun (u', l) u -> (u, (u -. u')::l))
......
let str="2.11"
let sha="cbbc67b"
let str="2.12"
let sha="3370a09"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment