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

Merge pull request #6 from jpdeplaix/master

Browse source 
OASIS: Use the compiled_setup_ml AlphaFeature
This commit is contained in:
Simon Cruanes 2014-08-24 21:27:11 +02:00
commit d077d21fb6
4 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Makefile
View file

@ -1,41 +1,46 @@
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: a3c674b4239234cbbe53afe090018954) # DO NOT EDIT (digest: 9a60866e2fa295c5e33a3fe33b8f3a32)
SETUP = ocaml setup.ml SETUP = ./setup.exe
build: setup.data build: setup.data $(SETUP)
$(SETUP) -build $(BUILDFLAGS) $(SETUP) -build $(BUILDFLAGS)
doc: setup.data build doc: setup.data $(SETUP) build
$(SETUP) -doc $(DOCFLAGS) $(SETUP) -doc $(DOCFLAGS)
test: setup.data build test: setup.data $(SETUP) build
$(SETUP) -test $(TESTFLAGS) $(SETUP) -test $(TESTFLAGS)
all: all: $(SETUP)
$(SETUP) -all $(ALLFLAGS) $(SETUP) -all $(ALLFLAGS)
install: setup.data install: setup.data $(SETUP)
$(SETUP) -install $(INSTALLFLAGS) $(SETUP) -install $(INSTALLFLAGS)
uninstall: setup.data uninstall: setup.data $(SETUP)
$(SETUP) -uninstall $(UNINSTALLFLAGS) $(SETUP) -uninstall $(UNINSTALLFLAGS)
reinstall: setup.data reinstall: setup.data $(SETUP)
$(SETUP) -reinstall $(REINSTALLFLAGS) $(SETUP) -reinstall $(REINSTALLFLAGS)
clean: clean: $(SETUP)
$(SETUP) -clean $(CLEANFLAGS) $(SETUP) -clean $(CLEANFLAGS)
distclean: distclean: $(SETUP)
$(SETUP) -distclean $(DISTCLEANFLAGS) $(SETUP) -distclean $(DISTCLEANFLAGS)
$(RM) $(SETUP)
setup.data: setup.data: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS) $(SETUP) -configure $(CONFIGUREFLAGS)
configure: configure: $(SETUP)
$(SETUP) -configure $(CONFIGUREFLAGS) $(SETUP) -configure $(CONFIGUREFLAGS)
setup.exe: setup.ml
ocamlfind ocamlopt -o $@ -linkpkg -package oasis.dynrun $< || ocamlfind ocamlc -o $@ -linkpkg -package oasis.dynrun $< || true
$(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
# OASIS_STOP # OASIS_STOP

1
_oasis
View file

@ -8,6 +8,7 @@ LicenseFile: LICENSE
Plugins: META (0.3), DevFiles (0.3) Plugins: META (0.3), DevFiles (0.3)
OCamlVersion: >= 4.00.1 OCamlVersion: >= 4.00.1
BuildTools: ocamlbuild BuildTools: ocamlbuild
AlphaFeatures: compiled_setup_ml
Synopsis: A modular standard library focused on data structures. Synopsis: A modular standard library focused on data structures.
Description: Description:

4
configure vendored
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: dc86c2ad450f91ca10c931b6045d0499) # DO NOT EDIT (digest: 6f7b8221311e800a7093dc3b793f67ca)
set -e set -e
FST=true FST=true
@ -23,5 +23,5 @@ for i in "$@"; do
esac esac
done done
ocaml setup.ml -configure "$@" make configure CONFIGUREFLAGS="$*"
# OASIS_STOP # OASIS_STOP

11
setup.ml
View file

@ -1,7 +1,7 @@
(* 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: 9852805d5c19ca1cb6abefde2dcea323) *) (* DO NOT EDIT (digest: 172e37fc4b327922311f6cf9389bc560) *)
(******************************************************************************) (******************************************************************************)
(* OASIS: architecture for building OCaml libraries and applications *) (* OASIS: architecture for building OCaml libraries and applications *)
(* *) (* *)
@ -24,14 +24,7 @@
(* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *) (* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA *)
(******************************************************************************) (******************************************************************************)
let () = open OASISDynRun
try
Topdirs.dir_directory (Sys.getenv "OCAML_TOPLEVEL_PATH")
with Not_found -> ()
;;
#use "topfind";;
#require "oasis.dynrun";;
open OASISDynRun;;
(* OASIS_STOP *) (* OASIS_STOP *)
let () = setup ();; let () = setup ();;