simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 11:15:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update oasis setup

Browse source
This commit is contained in:
Simon Cruanes 2016-11-02 11:47:57 +01:00
parent 3e7cbc1420
commit 89c63a5357
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,5 +1,5 @@
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32) # DO NOT EDIT (digest: 4c293511860bb966e727ba6f0ecc8197)
SETUP = ./setup.exe SETUP = ./setup.exe
@ -37,8 +37,8 @@ setup.data: $(SETUP)
configure: $(SETUP) configure: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS) $(SETUP) -configure $(CONFIGUREFLAGS)
setup.exe: setup.ml setup.exe: setup.ml _oasis
ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun setup.ml || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun setup.ml || true
$(RM) setup.cmi setup.cmo setup.cmx setup.o $(RM) setup.cmi setup.cmo setup.cmx setup.o
.PHONY: build doc test all install uninstall reinstall clean distclean configure .PHONY: build doc test all install uninstall reinstall clean distclean configure

8
configure vendored
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca) # DO NOT EDIT (digest: 7577949ceda6f9dbd4983aea8db9275b)
set -e set -e
FST=true FST=true
@ -23,5 +23,9 @@ for i in "$@"; do
esac esac
done done
make configure CONFIGUREFLAGS="$*" if [ ! -e setup.exe ] || [ _oasis -nt setup.exe ] || [ setup.ml -nt setup.exe ] || [ configure -nt setup.exe ]; then
ocamlfind ocamlopt -o setup.exe -linkpkg -package oasis.dynrun setup.ml || ocamlfind ocamlc -o setup.exe -linkpkg -package oasis.dynrun setup.ml || exit 1
rm -f setup.cmi setup.cmo setup.cmx setup.o
fi
./setup.exe -configure "$@"
# OASIS_STOP # OASIS_STOP

6
setup.ml
View file

@ -1,11 +1,11 @@
(* setup.ml generated for the first time by OASIS v0.4.4 *) (* setup.ml generated for the first time by OASIS v0.4.4 *)
(* OASIS_START *) (* OASIS_START *)
(* DO NOT EDIT (digest: 172e37fc4b327922311f6cf9389bc560) *) (* DO NOT EDIT (digest: 1bc19e72587da58c1e1f99f847b509aa) *)
(******************************************************************************) (******************************************************************************)
(* OASIS: architecture for building OCaml libraries and applications *) (* OASIS: architecture for building OCaml libraries and applications *)
(* *) (* *)
(* Copyright (C) 2011-2013, Sylvain Le Gall *) (* Copyright (C) 2011-2016, Sylvain Le Gall *)
(* Copyright (C) 2008-2011, OCamlCore SARL *) (* Copyright (C) 2008-2011, OCamlCore SARL *)
(* *) (* *)
(* This library is free software; you can redistribute it and/or modify it *) (* This library is free software; you can redistribute it and/or modify it *)
@ -26,5 +26,7 @@
open OASISDynRun open OASISDynRun
let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
open BaseCompat.Compat_0_4
(* OASIS_STOP *) (* OASIS_STOP *)
let () = setup ();; let () = setup ();;