CatalaLang/catala
1
1
Fork 0
mirror of https://github.com/CatalaLang/catala.git synced 2024-09-19 00:15:39 +03:00
Code Issues Projects Releases Wiki Activity

Revert to old system... Trying to please dune gods is hard

Browse Source
This commit is contained in:
Denis Merigoux 2021-04-29 17:05:53 +02:00
parent 54a7daa1ab
commit 3f5e423e9f
17 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -160,12 +160,12 @@ tests_ml: run_french_law_library_tests
FRENCH_LAW_LIB_DIR=src/french_law
$(FRENCH_LAW_LIB_DIR)/law_source/allocations_familiales.ml:
$(FRENCH_LAW_LIB_DIR)/law_source/allocations_familiales.ml: .FORCE
CATALA_OPTS="-O -t" $(MAKE) -C $(ALLOCATIONS_FAMILIALES_DIR) allocations_familiales.ml
cp -f $(ALLOCATIONS_FAMILIALES_DIR)/allocations_familiales.ml \
$(FRENCH_LAW_LIB_DIR)/law_source
$(FRENCH_LAW_LIB_DIR)/law_source/unit_tests/tests_allocations_familiales.ml:
$(FRENCH_LAW_LIB_DIR)/law_source/unit_tests/tests_allocations_familiales.ml: .FORCE
CATALA_OPTS="-O -t" $(MAKE) -s -C $(ALLOCATIONS_FAMILIALES_DIR) tests/tests_allocations_familiales.ml
cp -f $(ALLOCATIONS_FAMILIALES_DIR)/tests/tests_allocations_familiales.ml \
$(FRENCH_LAW_LIB_DIR)/law_source/unit_tests/
@ -209,7 +209,8 @@ website-assets: doc literate_examples grammar.html catala.html js_build build_fr
# Misceallenous
##########################################
all: dependencies build doc tests literate_examples website-assets build_french_law_library
all: dependencies build doc tests generate_french_law_library build_french_law_library build_french_law_library_js \
tests_ml website-assets
#> clean : Clean build artifacts
clean:

2
src/catala/catala.ml
View File

@ -12,4 +12,4 @@
or implied. See the License for the specific language governing permissions and limitations under
the License. *)
let _ = Catala_lib.Driver.main ()
let _ = Driver.main ()

22
src/catala/catala_lib.ml
View File

@ -1,22 +0,0 @@
(* This file is part of the Catala compiler, a specification language for tax and social benefits
computation rules. Copyright (C) 2021 Inria, contributor: Denis Merigoux
<denis.merigoux@inria.fr>
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
in compliance with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software distributed under the License
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the specific language governing permissions and limitations under
the License. *)
module Driver = Driver
module Utils = Utils
module Literate = Literate
module Surface = Surface
module Desugared = Desugared
module Dcalc = Dcalc
module Lcalc = Lcalc
module Runtime = Runtime

2
src/catala/catala_web.ml
View File

@ -1,4 +1,4 @@
open Catala_lib.Driver
open Driver
open Js_of_ocaml
let _ =

2
src/catala/dcalc/dune
View File

@ -1,7 +1,7 @@
(library
(name dcalc)
(public_name catala.dcalc)
(libraries bindlib unionFind utils re camomile runtime)
(package catala)
(preprocess
(pps visitors.ppx)))

2
src/catala/desugared/dune
View File

@ -1,6 +1,6 @@
(library
(name desugared)
(package catala)
(public_name catala.desugared)
(libraries utils dcalc scopelang ocamlgraph))
(documentation

14
src/catala/dune
View File

@ -1,18 +1,12 @@
(library
(name driver)
(package catala)
(public_name catala.driver)
(libraries utils surface desugared literate dcalc lcalc runtime)
(modules driver))
(library
(name catala_lib)
(public_name catala.catala_lib)
(libraries driver utils surface desugared literate dcalc lcalc runtime)
(modules catala_lib))
(library
(name runtime)
(package catala)
(public_name catala.runtime)
(libraries calendar zarith zarith_stubs_js)
(modules runtime))
@ -24,7 +18,7 @@
(modules catala_web)
(preprocess
(pps js_of_ocaml-ppx))
(libraries catala_lib js_of_ocaml))
(libraries catala.driver js_of_ocaml))
(executable
(name catala)
@ -32,7 +26,7 @@
(package catala)
(modules catala)
(public_name catala)
(libraries catala_lib))
(libraries catala.driver))
(documentation
(package catala)

2
src/catala/lcalc/dune
View File

@ -1,6 +1,6 @@
(library
(name lcalc)
(package catala)
(public_name catala.lcalc)
(libraries bindlib dcalc scopelang runtime))
(documentation

2
src/catala/lcalc/to_ocaml.ml
View File

@ -453,7 +453,7 @@ let format_program (fmt : Format.formatter) (p : Ast.program)
Format.fprintf fmt
"(** This file has been generated by the Catala compiler, do not edit! *)@\n\
@\n\
open Catala_lib.Runtime@\n\
open Runtime@\n\
@\n\
[@@@@@@ocaml.warning \"-26-27-32\"]@\n\
@\n\

2
src/catala/literate/dune
View File

@ -1,6 +1,6 @@
(library
(name literate)
(package catala)
(public_name catala.literate)
(libraries re utils surface))
(documentation

2
src/catala/scopelang/dune
View File

@ -1,6 +1,6 @@
(library
(name scopelang)
(package catala)
(public_name catala.scopelang)
(libraries utils dcalc ocamlgraph))
(documentation

2
src/catala/surface/dune
View File

@ -1,5 +1,6 @@
(library
(name surface)
(public_name catala.surface)
(libraries
utils
menhirLib
@ -10,7 +11,6 @@
zarith
zarith_stubs_js
calendar)
(package catala)
(preprocess
(pps sedlex.ppx visitors.ppx)))

2
src/catala/utils/dune
View File

@ -1,6 +1,6 @@
(library
(name utils)
(package catala)
(public_name catala.utils)
(libraries cmdliner ANSITerminal re))
(documentation

6
src/french_law/dune
View File

@ -2,7 +2,7 @@
(name bench)
(modes native)
(modules bench)
(libraries catala_lib french_law benchmark))
(libraries catala.runtime french_law benchmark))
(executable
(name api_web)
@ -10,12 +10,12 @@
(modules api_web)
(preprocess
(pps js_of_ocaml-ppx))
(libraries catala_lib law_source js_of_ocaml))
(libraries catala.runtime law_source js_of_ocaml))
(library
(name api)
(public_name french_law)
(synopsis
"A collection of functions for computing French taxes and benefits derived from Catala programs")
(libraries catala_lib law_source)
(libraries catala.runtime law_source)
(modules api))

2
src/french_law/law_source/allocations_familiales.ml
View File

@ -1,6 +1,6 @@
(** This file has been generated by the Catala compiler, do not edit! *)
open Catala_lib.Runtime
open Runtime
[@@@ocaml.warning "-26-27-32"]

2
src/french_law/law_source/dune
View File

@ -1,4 +1,4 @@
(library
(name law_source)
(public_name french_law.law_source)
(libraries catala_lib))
(libraries catala.runtime))

2
src/french_law/law_source/unit_tests/dune
View File

@ -1,4 +1,4 @@
(executable
(name run_tests)
(modes native)
(libraries catala_lib ANSITerminal))
(libraries catala.runtime ANSITerminal))