Port to dune

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

Makefile

@@ -1,18 +1,18 @@
-JBUILDER ?= jbuilder
+DUNE ?= dune
 
 all:
-	$(JBUILDER) build --dev
+	$(DUNE) build
 
 tests:
-	$(JBUILDER) runtest --dev
+	$(DUNE) runtest
 
 check: tests
 
 clean:
-	$(JBUILDER) clean
+	$(DUNE) clean
 
 all-supported-ocaml-versions:
-	$(JBUILDER) runtest --dev --workspace jbuild-workspace.dev
+	$(DUNE) runtest  --workspace dune-workspace.dev
 
 doc:
 	cd doc && sphinx-build . _build

atd.opam

@@ -7,14 +7,14 @@ bug-reports: "https://github.com/mjambon/atd/issues"
 dev-repo: "git://github.com/mjambon/atd.git"
 
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name] {with-test}
 ]
 
 depends: [
   "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
+  "dune" {build}
   "menhir" {build}
   "easy-format"
 ]

atd/src/dune

@@ -0,0 +1,8 @@
+(ocamllex lexer doc_lexer)
+(menhir (modules parser))
+
+(library
+ (name atd)
+ (public_name atd)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (libraries easy-format unix str))

atd/src/jbuild

@@ -0,0 +1,9 @@
+(executables
+ (libraries atd)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (names unit_tests))
+
+(alias
+ (name   runtest)
+ (package atd)
+ (action (run ./unit_tests.exe)))

atd/test/dune

@@ -0,0 +1,6 @@
+(executables
+ (names atdcat)
+ (public_names atdcat)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (libraries atd)
+ (package atd))

atd/test/jbuild

@@ -0,0 +1,3 @@
+(library
+ (name atdgen_codec_runtime)
+ (public_name atdgen-codec-runtime))

atdcat/dune

@@ -0,0 +1,4 @@
+(install
+ (section bin)
+ (package atdgen)
+ (files atdgen-cppo cppo-json))

atdcat/jbuild

@@ -7,14 +7,14 @@ bug-reports: "https://github.com/mjambon/atd/issues"
 dev-repo: "git://github.com/mjambon/atd.git"
 
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name] {with-test}
 ]
 
 depends: [
   "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
+  "dune" {build}
   "biniou" {>= "1.0.6"}
   "yojson" {>= "1.2.1" }
 ]

atdgen-codec-runtime/src/dune

@@ -0,0 +1,5 @@
+(library
+ (name atdgen_runtime)
+ (public_name atdgen-runtime)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (libraries biniou yojson))

atdgen-codec-runtime/src/jbuild

@@ -7,14 +7,14 @@ bug-reports: "https://github.com/mjambon/atd/issues"
 dev-repo: "git://github.com/mjambon/atd.git"
 
 build: [
-  ["jbuilder" "subst" "-n" name] {pinned}
-  ["jbuilder" "build" "-p" name "-j" jobs]
-  ["jbuilder" "runtest" "-p" name] {with-test}
+  ["dune" "subst"] {pinned}
+  ["dune" "build" "-p" name "-j" jobs]
+  ["dune" "runtest" "-p" name] {with-test}
 ]
 
 depends: [
   "ocaml" {>= "4.02.3"}
-  "jbuilder" {build}
+  "dune" {build}
   "atd" {>= "2.0.0"}
   "atdgen-runtime" {>= "2.0.0"}
   "biniou" {>= "1.0.6"}

atdgen-cppo/dune

@@ -0,0 +1,6 @@
+(executables
+ (libraries str atd atdgen_emit)
+ (names ag_main)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (public_names atdgen)
+ (package atdgen))

atdgen-cppo/jbuild

@@ -0,0 +1,7 @@
+;; this is a deprecated library whose only purpose is to re-export the runtime
+;; new users should be using atdgen_runtime
+(library
+ (name atdgen)
+ (public_name atdgen)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (libraries atdgen-runtime))

atdgen-runtime.opam

@@ -0,0 +1,6 @@
+(ocamllex doc_lexer)
+
+(library
+ (name atdgen_emit)
+ (flags (:include %{workspace_root}/ocamlflags.sexp))
+ (libraries atd yojson))

atdgen-runtime/src/dune

@@ -0,0 +1,47 @@
+(rule
+ (targets bucklespec_bs.ml bucklespec_bs.mli)
+ (deps bucklespec.atd)
+ (action (run atdgen %{deps} -bs -open Bucklespec_t)))
+
+(rule
+ (targets bucklespec_t.ml bucklespec_t.mli)
+ (deps bucklespec.atd)
+ (action (run atdgen %{deps} -t)))
+
+(rule
+ (targets bucklespec_j.ml bucklespec_j.mli)
+ (deps bucklespec.atd)
+ (action (run atdgen %{deps} -j -j-std)))
+
+(library
+ (name bucklespec_types)
+ (wrapped false)
+ (libraries atdgen-codec-runtime)
+ (modules bucklespec_t a_t a_bs))
+
+(library
+ (name bucklespec_bs)
+ (wrapped false)
+ (libraries atdgen-codec-runtime bucklespec_types)
+ (modules bucklespec_bs))
+
+(executable
+ (name bucklespec_roundtrip)
+ (modules bucklespec_roundtrip bucklespec_j a_j)
+ (libraries bucklespec_types bucklespec_bs atdgen-runtime))
+
+(alias
+ (name runtest)
+ (action (diff bucklespec_bs.expected.ml bucklespec_bs.ml)))
+
+(alias
+ (name runtest)
+ (action (diff bucklespec_bs.expected.mli bucklespec_bs.mli)))
+
+(alias
+ (name runtest)
+ (action (diff bucklespec_j.expected.ml bucklespec_j.ml)))
+
+(alias
+ (name runtest)
+ (action (run ./bucklespec_roundtrip.exe)))