Update ppx_deriving_json to upstream master - also fixes windows exe …

…extension issue
jordwalke · May 14, 2020 · 098f478 · 098f478
1 parent d378755
commit 098f478
Show file tree

Hide file tree

Showing 4 changed files with 901 additions and 771 deletions.
diff --git a/ppx/ppx_deriving_json/lib/dune b/ppx/ppx_deriving_json/lib/dune
@@ -4,10 +4,9 @@
   (synopsis "[@@deriving json]")
   (ppx_runtime_libraries js_of_ocaml.deriving)
   (kind ppx_deriver)
-  (libraries ppx_deriving.api compiler-libs ppx_tools)
-  ; .exe is needed for windows.
-  (preprocess (action (run %{lib:ppx_tools:rewriter.exe} %{lib:ppx_tools:ppx_metaquot.exe} %{input-file}))))
 
-(rule
-  (targets ppx_deriving_json.ml)
-  (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{dep:ppx_deriving_json.cppo.ml} -o %{targets})))
+  (libraries compiler-libs.common
+             ocaml-migrate-parsetree
+             ppxlib
+  )
+  (preprocess (pps ppxlib.metaquot)))