From 9b6b6b11f7fa5f74994909d4eaaa4f4759982bb7 Mon Sep 17 00:00:00 2001 From: Jeremie Dimino Date: Fri, 24 Feb 2017 10:50:43 +0000 Subject: [PATCH] drop support for (preprocess metaquot) --- src/gen_rules.ml | 19 ------------------- src/jbuild_types.ml | 2 -- 2 files changed, 21 deletions(-) diff --git a/src/gen_rules.ml b/src/gen_rules.ml index 7683719d..f90b2af8 100644 --- a/src/gen_rules.ml +++ b/src/gen_rules.ml @@ -271,13 +271,6 @@ module Gen(P : Params) = struct | None -> sources | Some set -> String_set.union sources set - (* +-----------------------------------------------------------------+ - | Tools | - +-----------------------------------------------------------------+ *) - - let ppx_metaquot = Named_artifacts.in_findlib "ppx_tools:ppx_metaquot" - let ppx_rewriter = Named_artifacts.in_findlib "ppx_tools:rewriter" - (* +-----------------------------------------------------------------+ | User variables | +-----------------------------------------------------------------+ *) @@ -580,18 +573,6 @@ module Gen(P : Params) = struct String_map.map modules ~f:(fun (m : Module.t) -> match Preprocess_map.find m.name preprocess with | No_preprocessing -> m - | Metaquot -> - pped_module m ~dir ~f:(fun kind src dst -> - add_rule - (preprocessor_deps - >>> - Build.fanout (ppx_rewriter ~dir ~dep_kind) (ppx_metaquot ~dir ~dep_kind) - >>> - Build.run (Dyn fst) - [ Dyn (fun (_, ppx_metaquot) -> Dep ppx_metaquot) - ; A "-o"; Target dst - ; Ml_kind.flag kind; Dep src - ])) | Command cmd -> pped_module m ~dir ~f:(fun _kind src dst -> add_rule diff --git a/src/jbuild_types.ml b/src/jbuild_types.ml index 79fff5ad..4048dbc8 100644 --- a/src/jbuild_types.ml +++ b/src/jbuild_types.ml @@ -253,13 +253,11 @@ module Preprocess = struct type t = | No_preprocessing | Command of String_with_vars.t - | Metaquot | Pps of { pps : Pp_set.t; flags : string list } let t = sum [ cstr "no_preprocessing" [] No_preprocessing - ; cstr "metaquot" [] Metaquot ; cstr "command" [String_with_vars.t] (fun x -> Command x) ; cstr "pps" [list Pp_or_flag.t] (fun l -> let pps, flags = Pp_or_flag.split l in