stop relying on config scripts

Author: jfeser

bin/opt.ml

@@ -67,10 +67,8 @@ let eval dir params query =
             Fmt.str "-p %s:%a" n Prim_type.pp t)
         |> String.concat ~sep:" "
       in
-      sprintf
-        "$CASTOR_ROOT/../_build/default/castor/bin/compile.exe -o %s %s %s > \
-         %s/compile.log 2>&1"
-        dir params query_fn dir
+      sprintf "castor-compile -o %s %s %s > %s/compile.log 2>&1" dir params
+        query_fn dir
     in
     let%map out = command_out compile_cmd in
     Logs.info (fun m -> m "Compile output: %s" out)

castor.opam

@@ -7,7 +7,7 @@ license: "MIT"
 homepage: "https://github.com/jfeser/castor"
 bug-reports: "https://github.com/jfeser/castor/issues"
 depends: [
-  "dune" {build & >= "1.10"}
+  "dune" {>= "3.1" & >= "1.10"}
   "menhir" {build}
   "core" {>= "v0.12"}
   "postgresql" {>= "4.4"}
@@ -25,19 +25,22 @@ depends: [
   "ppx_let" {>= "v0.12"}
   "visitors" {>= "20180513"}
   "yojson"
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
+    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
+  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/jfeser/castor.git"

castor_test.opam

@@ -7,7 +7,7 @@ license: "MIT"
 homepage: "https://github.com/jfeser/castor"
 bug-reports: "https://github.com/jfeser/castor/issues"
 depends: [
-  "dune" {build & >= "1.10"}
+  "dune" {>= "3.1" & build & >= "1.10"}
   "castor"
   "postgresql" {>= "4.4"}
   "bos" {>= "0.2"}
@@ -24,19 +24,22 @@ depends: [
   "visitors" {>= "20180513"}
   "ounit"
   "expect_test_helpers_core" {>= "v0.12"}
+  "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
+    "--promote-install-files=false"
     "@install"
     "@runtest" {with-test}
     "@doc" {with-doc}
   ]
+  ["dune" "install" "-p" name "--create-install-files" name]
 ]
 dev-repo: "git+https://github.com/jfeser/castor.git"

config-sample.sh

@@ -1,4 +1,4 @@
-(lang dune 2.0)
+(lang dune 3.1)
 
 (name castor)
 (source (github jfeser/castor))
@@ -11,7 +11,7 @@
  (name castor)
  (synopsis "A deductive database synthesizer")
  (depends
-  (dune (and :build (>= 1.10)))
+  (dune (>= 1.10))
   (menhir :build)
 
   (core (>= v0.12))
@@ -29,7 +29,8 @@
   (ppx_hash (>= v0.12))
   (ppx_let (>= v0.12))
   (visitors (>= 20180513))
-  yojson))
+  yojson)
+ (sites (share code)))
 
 (package
  (name castor_test)
@@ -56,6 +57,7 @@
   (expect_test_helpers_core (>= v0.12))))
 
 (using menhir 2.0)
+(using dune_site 0.1)
 (generate_opam_files true)
 
 ; Local Variables:

dune-project

@@ -1,6 +1,6 @@
 (install
  (package castor)
- (section etc)
+ (section (site (castor code)))
  (files date.c date.h castorlib.c castorlib.h load_bool.c load_date.c
    load_float.c load_int.c load_string.c perf.c))
 

etc/dune

@@ -1014,7 +1014,7 @@ let c_template fn args =
   Util.command_out_exn ([ "clang"; "-E" ] @ args_strs @ [ fn ])
 
 let from_fn fn n i =
-  let template = Global.build_root () ^ "/etc/" ^ fn in
+  let template = Global.find_file fn in
   let func =
     c_template template [ ("PARAM_NAME", n); ("PARAM_IDX", Int.to_string i) ]
   in
@@ -1028,8 +1028,8 @@ let compile ?out_dir ?layout_log ?(debug = false) ~gprof ~params layout =
   (match Sys_unix.is_directory out_dir with
   | `No -> Core_unix.mkdir out_dir
   | _ -> ());
-  let stdlib_fn = Global.build_root () ^ "/etc/castorlib.c" in
-  let date_fn = Global.build_root () ^ "/etc/date.c" in
+  let stdlib_fn = Global.find_file "castorlib.c" in
+  let date_fn = Global.find_file "date.c" in
   let main_fn = out_dir ^ "/main.c" in
   let ir_fn = out_dir ^ "/scanner.ir" in
   let module_fn = out_dir ^ "/scanner.ll" in
@@ -1093,7 +1093,7 @@ let compile ?out_dir ?layout_log ?(debug = false) ~gprof ~params layout =
     let header_str = "#include \"scanner.h\"" in
     let funcs_str = String.concat (header_str :: funcs) ~sep:"\n" in
     let calls_str = String.concat calls ~sep:"\n" in
-    let perf_template = Global.build_root () ^ "/etc/perf.c" in
+    let perf_template = Global.find_file "perf.c" in
     let perf_c =
       let open In_channel in
       with_file perf_template ~f:(fun ch ->

lib/codegen.ml

@@ -13,8 +13,12 @@
  (libraries core core_unix.time_unix core_unix.bigstring_unix
    core_unix.filename_unix lwt lwt.unix postgresql llvm llvm.analysis
    llvm.target llvm.all_backends logs visitors.runtime fmt fmt.tty genhash
-   iter yojson ocamlgraph combinat)
+   iter yojson ocamlgraph combinat dune-site)
  (inline_tests)
  (preprocess
   (pps ppx_sexp_conv ppx_compare ppx_hash ppx_expect ppx_let visitors.ppx
     ppx_variants_conv lwt_ppx ppx_sexp_message)))
+
+(generate_sites_module
+ (module sites)
+ (sites castor))

lib/dune

@@ -1,5 +1,18 @@
 open Core
 
 let fresh = Fresh.create ()
-let build_root () = Sys.getenv_exn "CASTOR_ROOT"
+
+let find_file fn =
+  let dirs = Sites.Sites.code in
+  let m_fn =
+    List.find_map dirs ~f:(fun dir ->
+        let fn = Filename.concat dir fn in
+        match Sys_unix.file_exists fn with `Yes -> Some fn | _ -> None)
+  in
+  match m_fn with
+  | Some fn -> fn
+  | None ->
+      raise_s
+        [%message "could not find file" (fn : string) "in" (dirs : string list)]
+
 let enable_redshift_dates = ref false

lib/global.ml

@@ -1,3 +1,7 @@
+(env
+ (_ (env-vars
+     (CASTOR_TPCH_TEST_DB postgresql:///tpch_1k))))
+
 (rule
  (alias test_db)
  (action

test/dune

@@ -4,6 +4,7 @@
  (flags -open Core -open Castor)
  (inline_tests
   (deps
-   (alias ../test_db)))
+   (alias ../test_db)
+   (env_var CASTOR_TPCH_TEST_DB)))
  (preprocess
   (pps ppx_sexp_conv ppx_compare ppx_expect ppx_sexp_message)))

test/lib/dune

@@ -49,7 +49,7 @@ ahashidx(dedup(
   alist(select([p_counter, c_counter],
     join(p_counter < c_counter && c_counter < p_succ,
       filter(p_id = k.p_id,
-        select([id as p_id, counter as p_counter, succ as p_succ], %s)), 
+        select([id as p_id, counter as p_counter, succ as p_succ], %s)),
       filter(c_id = k.c_id,
         select([id as c_id, counter as c_counter], %s)))) as lk,
     atuple([ascalar(lk.p_counter), ascalar(lk.c_counter)], cross)),
@@ -63,14 +63,14 @@ ahashidx(dedup(
 select([p_counter, c_counter],
   depjoin(
     ahashidx(dedup(select([id as p_id], %s)) as hk,
-    alist(select([counter, succ], filter(hk.p_id = id && counter < succ, %s)) as lk1, 
-      atuple([ascalar(lk1.counter as p_counter), ascalar(lk1.succ as p_succ)], cross)), 
+    alist(select([counter, succ], filter(hk.p_id = id && counter < succ, %s)) as lk1,
+      atuple([ascalar(lk1.counter as p_counter), ascalar(lk1.succ as p_succ)], cross)),
     id_p) as dk,
   select([dk.p_counter, c_counter],
   filter(c_id = id_c,
-    aorderedidx(select([counter], %s) as ok, 
+    aorderedidx(select([counter], %s) as ok,
       alist(filter(counter = ok.counter, %s) as lk2,
-        atuple([ascalar(lk2.id as c_id), ascalar(lk2.counter as c_counter)], cross)), 
+        atuple([ascalar(lk2.id as c_id), ascalar(lk2.counter as c_counter)], cross)),
       dk.p_counter, dk.p_succ)))))
 |}
       log log log log
@@ -81,4 +81,3 @@ let sum_complex =
    ATuple([AScalar(k.f), AScalar((k.g - k.f) as v)], cross)))"
 
 let tpch_conn = lazy (Db.create @@ Sys.getenv_exn "CASTOR_TPCH_TEST_DB")
-let tpch_full_conn = lazy (Db.create @@ Sys.getenv_exn "CASTOR_TPCH_DB")

test/lib/test_util.ml

@@ -1,9 +1,8 @@
 (include dune.inc)
 
 (rule
- (with-stdout-to
-  dune.inc.gen
-  (run ./gen_dune.py)))
+ (action (with-stdout-to dune.inc.gen (run ./gen_dune.py)))
+ (deps (env_var CASTOR_TPCH_TEST_DB)))
 
 (rule
  (alias runtest)