Commit cbcf6675 authored by erwan's avatar erwan
Browse files

lutils only from ocaml 4.02 because of the Byte vs String issue

parent 080108b9
Pipeline #7634 passed with stages
in 3 minutes and 17 seconds
......@@ -2,7 +2,7 @@
all:build
BINPATH=$(shell dirname `which ocamlc`)/..
PREFIX=$(shell opam config var prefix)
-include ./Makefile.version
......@@ -15,7 +15,7 @@ setup.ml:_oasis
setup.data:configure
configure: setup.ml
ocaml setup.ml -configure --prefix $(BINPATH) --exec-prefix $(BINPATH)
ocaml setup.ml -configure --prefix $(PREFIX)
install:
......
OASISFormat: 0.4
Name: lutils
Version: 1.43
Version: 1.44
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: CeCILL
......@@ -17,8 +17,10 @@ Description:
BuildTools: ocamlbuild
PreBuildCommand: make src/lutilsVersion.ml
OCamlVersion: >= 4.02
PostInstallCommand: cp emacs/*.el $prefix/lib/$pkg_name
# A simple data visualiser based on gnuplot
Executable "gnuplot-rif"
Path: src
......
# OASIS_START
# DO NOT EDIT (digest: f04ddb896e4fab2fba33404580bc4a83)
# DO NOT EDIT (digest: 8b63ea904ea0002641021b2a51f5104d)
# 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
......@@ -15,16 +15,16 @@ true: annot, bin_annot
"_darcs": -traverse
"_darcs": not_hygienic
# Executable gnuplot-rif
"src/gnuplotRifMain.native": pkg_camlp4
"src/gnuplotRifMain.native": pkg_num
"src/gnuplotRifMain.native": pkg_str
"src/gnuplotRifMain.native": pkg_unix
"src/gnuplotRifMain.native": package(camlp4)
"src/gnuplotRifMain.native": package(num)
"src/gnuplotRifMain.native": package(str)
"src/gnuplotRifMain.native": package(unix)
# Library lutils
"src/lutils.cmxs": use_lutils
<src/*.ml{,i,y}>: pkg_camlp4
<src/*.ml{,i,y}>: pkg_num
<src/*.ml{,i,y}>: pkg_str
<src/*.ml{,i,y}>: pkg_unix
<src/*.ml{,i,y}>: package(camlp4)
<src/*.ml{,i,y}>: package(num)
<src/*.ml{,i,y}>: package(str)
<src/*.ml{,i,y}>: package(unix)
# OASIS_STOP
"src/gnuplotRif.ml": syntax_camlp4o
......
\newcommand{\version}{1.43}
\newcommand{\sha}{5a19499}
\newcommand{\version}{1.44}
\newcommand{\sha}{080108b}
\newcommand{\versionname}{none}
\newcommand{\versiondate}{03-05-18}
\newcommand{\versiondate}{15-05-18}
(* setup.ml generated for the first time by OASIS v0.4.10 *)
(* OASIS_START *)
(* DO NOT EDIT (digest: a05242512da59f2a1faaabbf3277d0c8) *)
(* DO NOT EDIT (digest: 7a6bf0c8c372a6f256906c3924b3684f) *)
(*
Regenerated by OASIS v0.4.10
Visit http://oasis.forge.ocamlcore.org for more information and
......@@ -6840,7 +6840,7 @@ open OASISTypes;;
let setup_t =
{
BaseSetup.configure = InternalConfigurePlugin.configure;
build = OCamlbuildPlugin.build [];
build = OCamlbuildPlugin.build ["-use-ocamlfind"];
test = [];
doc = [];
install = InternalInstallPlugin.install;
......@@ -6854,8 +6854,8 @@ let setup_t =
package =
{
oasis_version = "0.4";
ocaml_version = None;
version = "1.43";
ocaml_version = Some (OASISVersion.VGreaterEqual "4.02");
version = "1.44";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
......@@ -7256,7 +7256,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
oasis_digest = Some "b\004L8Kp\187s\138\n\238\"\244\170\003\214";
oasis_digest = Some "qS\025\1479\017\170\225\159\180'\215\020`\022\209";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
......
# OASIS_START
# DO NOT EDIT (digest: f8fe83befb77c8c6f01a283a75e670a0)
version = "1.43"
# DO NOT EDIT (digest: edb5a8985f03b1674efb93fc7298fc35)
version = "1.44"
description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)."
requires = "unix str camlp4 num"
archive(byte) = "lutils.cma"
......
(* Time-stamp: <modified the 27/01/2016 (at 14:39) by Erwan Jahier> *)
(* Time-stamp: <modified the 07/05/2018 (at 10:11) by Erwan Jahier> *)
(*-----------------------------------------------------------------------
** This file may only be copied under the terms of the GNU Library General
** Public License
......@@ -16,7 +16,7 @@ let soi = string_of_int
(** Generates stub files for calling luciole. *)
(* Generate a Makefile that compiles files generated by gen_stubs,
(** Generate a Makefile that compiles files generated by gen_stubs,
and calls luciole on the resulting .dro file.
the first arg is a just a string used to invent file names
......
let str="1.43"
let sha="5a19499"
let str="1.44"
let sha="080108b"
Supports Markdown
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