Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit cbbc67bb authored by Erwan Jahier's avatar Erwan Jahier
Browse files

Patch the oasis2opam gerenated opam file file to override also the install rule.

parent 49f02ba7
......@@ -28,29 +28,28 @@ lutin-utils/src/lutinutils.ml: lutin-utils/src/lutinUtils.idl
###################################################
build: setup.data $(CAMLIDL)/dllcamlidl.so
ocaml setup.ml -build
ocaml setup.ml -build
setup.ml:_oasis lutin/src/version.ml polka/vector.ml lutin-utils/src/lutinutils.ml
oasis setup
BINPATH=$(shell dirname `which ocamlc`)/..
setup.data:configure
configure: setup.ml
ocaml setup.ml -configure \
--prefix $(LURETTE_PATH) \
--exec-prefix $(LURETTE_PATH)/$(HOSTTYPE) \
--enable-tests
ocaml setup.ml -configure --prefix $(BINPATH) --exec-prefix $(BINPATH)
.PHONY:doc
doc:
ocaml setup.ml -doc
install:
install:
ocaml setup.ml -install
cp lutin/src/lut4c_stubs.h $(shell ocamlc -where)/../lutin/
uninstall:
ocaml setup.ml -uninstall
rm -f $(shell ocamlc -where)/../lutin/lut4c_stubs.h
reinstall:
ocaml setup.ml -reinstall
......
......@@ -82,6 +82,7 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
oasis2opam $(HTTP)/pool/$(PACKNAME).tgz && \
echo "OPAM_FILE=$(OPAM_FILE)" && \
cat $(OPAM_FILE) | ocaml $(PWD)/utils/fixopam_file.ml > $(OPAM_FILE)-fixed && \
cp $(OPAM_FILE) $(OPAM_FILE).save && \
cp $(OPAM_FILE)-fixed $(OPAM_FILE) && \
cd .. ; opam-admin check && opam-admin make -g
......
OASISFormat: 0.4
Name: Lutin
Version: 2.6
Version: 2.10
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: PROP
......
#include <stdio.h>
#include <string.h>
// #include <caml/mlvalues.h>
// #include <caml/callback.h>
#ifdef WIN32
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#endif
/* ********************************************************************** */
/* Types */
/* ********************************************************************** */
typedef int process_nb;
/** To indicate whether the point used to perform the step is
drawn inside, at edges, or at vertices of the convex hull of
numeric solutions; the step mode is used iff at least one
controllable variable is numeric.
The default step mode is StepInside.
*/
typedef enum step_mode { step_inside, step_edge, step_vertex } step_mode;
/* ********************************************************************** */
/* Initialisation of Caml runtime */
/* ********************************************************************** */
/** Call this function exactly once */
EXPORT void lutin_caml_init();
/* ********************************************************************** */
/* Create/Kill a Lutin process */
/* ********************************************************************** */
EXPORT process_nb make(const char * pre_processor, const char * filename);
// To be called before make_lutin
EXPORT void add_lutin_lib(const char * libname);
EXPORT process_nb make_lutin(const char * pre_processor, const char * filename);
EXPORT void kill_process_nb(process_nb lp);
/* ====================================================================== */
/* Set inputs functions */
/* ====================================================================== */
EXPORT void lutin_set_input_bool(process_nb lp, char* vn, int v);
EXPORT void lutin_set_input_int(process_nb lp, char* vn, int v);
EXPORT void lutin_set_input_float(process_nb lp, char* vn, double v);
/* ********************************************************************** */
/* Step function */
/* ********************************************************************** */
EXPORT void lutin_step(process_nb lp, step_mode sm);
/* ====================================================================== */
/* Get outputs functions */
/* ====================================================================== */
EXPORT int lutin_get_output_bool(process_nb lp, char* vn);
EXPORT int lutin_get_output_int(process_nb lp, char* vn);
EXPORT double lutin_get_output_float(process_nb lp, char* vn);
let str="2.6"
let sha="6b5e98a"
let str="2.10"
let sha="49f02ba"
(* Time-stamp: <modified the 13/06/2016 (at 11:00) by Erwan Jahier> *)
(* Time-stamp: <modified the 14/06/2016 (at 18:14) by Erwan Jahier> *)
(* Replace
build: [ * ]
by
......@@ -10,11 +10,19 @@ let _ =
try
while true do
let line = read_line () in
if !removing then () else print_string (line^"\n");
if String.length line > 5 && String.sub line 0 6 = "build:" then removing := true;
if !removing && line.[0] = ']' then (
if String.length line > 7 && String.sub line 0 8 = "install:" then
print_string "install: [\"make\" \"install\"]\n"
else
if !removing then () else print_string (line^"\n");
if String.length line > 5 && String.sub line 0 6 = "build:" then
removing := true;
if !removing && line.[0] = ']' then (
removing := false;
print_string " [\"make\"]\n]\n"
print_string " [\"oasis\" \"setup\"]
[\"ocaml\" \"setup.ml\" \"-configure\" \"--prefix\" prefix]
[\"make\" \"build\"]
]
"
);
done
with End_of_file -> flush stdout
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