Reduce ppx dependencies

mbarbin · Feb 27, 2024 · 4ba189a · 4ba189a
1 parent fe90870
commit 4ba189a
Show file tree

Hide file tree

Showing 17 changed files with 80 additions and 37 deletions.
diff --git a/bin/dune b/bin/dune
@@ -2,6 +2,4 @@
  (name main)
  (public_name bopkit)
  (libraries bopkit_command command-unix-for-opam)
- (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
diff --git a/lib/bopkit_process_syntax/src/dune b/lib/bopkit_process_syntax/src/dune
@@ -7,6 +7,4 @@
  (name bopkit_process_syntax)
  (public_name bopkit.process-syntax)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a -open Core)
- (libraries bopkit_process core parsing-utils)
- (preprocess
-  (pps ppx_jane)))
+ (libraries bopkit_process core parsing-utils))
diff --git a/lib/bopkit_syntax/src/dune b/lib/bopkit_syntax/src/dune
@@ -16,6 +16,4 @@
  (name bopkit_syntax)
  (public_name bopkit.syntax)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a -open Core)
- (libraries bopkit core parsing-utils)
- (preprocess
-  (pps ppx_jane)))
+ (libraries bopkit core parsing-utils))
diff --git a/project/digital-watch/dune b/project/digital-watch/dune
@@ -3,7 +3,16 @@
  (flags -w +a-4-40-42-44-66 -warn-error +a -open Core)
  (libraries core command-unix-for-opam graphics threads)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (rule
  (alias digital-watch-simulation)

diff --git a/project/subleq/bin/dune b/project/subleq/bin/dune
@@ -2,6 +2,4 @@
  (name main)
  (public_name subleq)
  (libraries command-unix-for-opam subleq_command)
- (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a))
diff --git a/project/subleq/circuit/dune b/project/subleq/circuit/dune
@@ -10,7 +10,16 @@
   unix
   threads)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (rule
  (alias subleq-simulation)

diff --git a/project/visa/bin/dune b/project/visa/bin/dune
@@ -2,6 +2,4 @@
  (names visa)
  (public_names visa)
  (libraries command-unix-for-opam visa_command)
- (flags -w +a-4-40-42-44-66 -warn-error +a)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (flags -w +a-4-40-42-44-66 -warn-error +a))
diff --git a/project/visa/circuit/dune b/project/visa/circuit/dune
@@ -164,7 +164,16 @@
  (flags -w +a-4-40-42-44-66 -warn-error +a -open Core)
  (libraries command-unix-for-opam core unix threads bopkit_block)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (cram
  (deps

diff --git a/project/visa/lib/visa_debugger/bin/dune b/project/visa/lib/visa_debugger/bin/dune
@@ -2,6 +2,4 @@
  (names main)
  (public_names visa-debugger)
  (libraries command-unix-for-opam visa_debugger)
- (flags -w +a-4-40-42-44-66 -warn-error +a)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (flags -w +a-4-40-42-44-66 -warn-error +a))
diff --git a/project/visa/lib/visa_syntax/src/dune b/project/visa/lib/visa_syntax/src/dune
@@ -7,6 +7,4 @@
  (name visa_syntax)
  (public_name bopkit.visa-syntax)
  (flags :standard -w +a-4-40-41-42-44-45-48-66 -warn-error +a -open Core)
- (libraries core parsing-utils visa)
- (preprocess
-  (pps ppx_jane)))
+ (libraries core parsing-utils visa))
diff --git a/stdlib/7-segment/bin/dune b/stdlib/7-segment/bin/dune
@@ -12,7 +12,16 @@
   graphics
   threads)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (install
  (section

diff --git a/stdlib/bopboard/bin/dune b/stdlib/bopboard/bin/dune
@@ -1,9 +1,7 @@
 (executables
  (names main)
  (flags -w +a-40-42-44-66 -warn-error +a)
- (libraries command-unix-for-opam bopboard)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (libraries command-unix-for-opam bopboard))
 
 (install
  (section

diff --git a/stdlib/counter/bin/dune b/stdlib/counter/bin/dune
@@ -1,8 +1,6 @@
 (executables
  (names counter)
- (libraries command-unix-for-opam bopkit_counter)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (libraries command-unix-for-opam bopkit_counter))
 
 (install
  (section

diff --git a/stdlib/memories/bin/dune b/stdlib/memories/bin/dune
@@ -11,7 +11,16 @@
   unix
   threads)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (install
  (section

diff --git a/stdlib/pulse/bin/dune b/stdlib/pulse/bin/dune
@@ -1,8 +1,6 @@
 (executables
  (names pulse)
- (libraries command-unix-for-opam bopkit_pulse)
- (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+ (libraries command-unix-for-opam bopkit_pulse))
 
 (install
  (section

diff --git a/test/bop2c/gen-dune/dune b/test/bop2c/gen-dune/dune
@@ -9,4 +9,13 @@
   eio_main
   parsing-utils)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
diff --git a/tutorial/bdd/division/dune b/tutorial/bdd/division/dune
@@ -21,7 +21,16 @@
  (flags -w +a-4-40-41-42-44-66 -warn-error +a -open Core)
  (libraries core graphics unix threads bopkit_block)
  (preprocess
-  (pps ppx_jane ppx_js_style -check-doc-comments)))
+  (pps
+   ppx_compare
+   ppx_enumerate
+   ppx_hash
+   ppx_here
+   ppx_let
+   ppx_sexp_conv
+   ppx_sexp_value
+   ppx_js_style
+   -check-doc-comments)))
 
 (rule
  (deps