diff --git a/INSTALL.md b/INSTALL.md index bfc696ee..a45bddd6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -18,7 +18,7 @@ the hint and enter `opam switch create 4.09.1`. Next, install all the OCaml packages that Catala depend on, as well as some git submodules, with - make install-dependencies + make dependencies This should ensure everything is set up for developping on the Catala compiler! diff --git a/Makefile b/Makefile index 9b29b303..e958b786 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ K := $(foreach exec,$(EXECUTABLES),\ $(if $(shell which $(exec)),some string,$(warning [WARNING] No "$(exec)" executable found. \ Please install this executable for everything to work smoothly))) -install-dependencies-ocaml: +dependencies-ocaml: opam install \ ocamlformat \ ANSITerminal \ @@ -22,7 +22,7 @@ install-dependencies-ocaml: obelisk \ unionfind \ bindlib \ - zarith \ + zarith zarith_stubs_js \ ocamlgraph \ js_of_ocaml-compiler \ odate @@ -30,7 +30,7 @@ install-dependencies-ocaml: init-submodules: git submodule update --init -install-dependencies: install-dependencies-ocaml init-submodules +dependencies: dependencies-ocaml init-submodules ########################################## @@ -161,7 +161,7 @@ website-assets: doc literate_examples grammar.html catala.html # Misceallenous ########################################## -all: install-dependencies build doc tests literate_examples website-assets +all: dependencies build doc tests literate_examples website-assets clean: dune clean @@ -177,5 +177,5 @@ inspect: # Special targets ########################################## .PHONY: inspect clean all literate_examples english allocations_familiales pygments \ - install build doc format install-dependencies install-dependencies-ocaml \ + install build doc format dependencies dependencies-ocaml \ catala.html diff --git a/catala.opam b/catala.opam index e1204662..c6ed412e 100644 --- a/catala.opam +++ b/catala.opam @@ -23,6 +23,7 @@ depends: [ "cmdliner" {>= "1.0.4"} "re" {>= "1.9.0"} "zarith" {>= "1.10"} + "zarith_stubs_js" {>= "0.14.0"} "dune" {build} "ocamlgraph" {>= "1.8.8"} "odate" {>= "0.6"} diff --git a/dune-project b/dune-project index 9a9430c1..66210e9d 100644 --- a/dune-project +++ b/dune-project @@ -1,4 +1,5 @@ (lang dune 2.2) + (name catala) (version 0.2.0) (generate_opam_files true) @@ -30,6 +31,7 @@ (cmdliner (>= 1.0.4)) (re (>= 1.9.0)) (zarith (>= 1.10)) + (zarith_stubs_js (>= 0.14.0)) (dune (and :build )) (ocamlgraph (>= 1.8.8)) (odate (>= 0.6)) diff --git a/src/catala/catala_surface/dune b/src/catala/catala_surface/dune index af62d0bd..cb1d342e 100644 --- a/src/catala/catala_surface/dune +++ b/src/catala/catala_surface/dune @@ -1,6 +1,7 @@ (library (name surface) - (libraries utils menhirLib sedlex re desugared scopelang zarith odate) + (libraries utils menhirLib sedlex re desugared scopelang zarith + zarith_stubs_js odate) (public_name catala.surface) (preprocess (pps sedlex.ppx))) diff --git a/src/catala/default_calculus/dune b/src/catala/default_calculus/dune index ff9f00da..97def089 100644 --- a/src/catala/default_calculus/dune +++ b/src/catala/default_calculus/dune @@ -1,7 +1,7 @@ (library (name dcalc) (public_name catala.dcalc) - (libraries bindlib unionFind utils zarith odate)) + (libraries bindlib unionFind utils zarith zarith_stubs_js odate)) (documentation (package catala))