also address rescript-lang#984

TheSpyder · Dec 12, 2016 · 037bf1a · 037bf1a
1 parent a059245
commit 037bf1a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/bsconfig.json b/bsconfig.json
@@ -466,7 +466,9 @@
                 "a_filename_test.ml",
                 "a.ml"
             ]
-        }
+    },
+
+    // "ppx-flags": ["reason/bin/reactjs_jsx_ppx"]
     // ,
     // "bs-dependencies" : ["mocha"]
     // , "generate-merlin" : true

diff --git a/jscomp/bin/bsb.ml b/jscomp/bin/bsb.ml
@@ -7312,10 +7312,16 @@ let write_ninja_file cwd =
     let ochan = open_out_bin (builddir // sourcedirs_meta) in
     let lib_ocaml_dir = (bsc_dir // ".."//"lib"//"ocaml") in 
     let buffer = Buffer.create 100 in 
+    let () = 
+      Bsb_default.get_ppx_flags ()
+      |> List.iter (fun x -> 
+          Buffer.add_string buffer (Printf.sprintf "PPX %s\n" x )
+        )
+    in 
     let () = Buffer.add_string buffer
         (Printf.sprintf "S %s\n\
                          B %s\n\
-                         PPX %s\n
+                         PPX %s\n\
                        " lib_ocaml_dir lib_ocaml_dir bsppx
         ) in 
     let () = 

diff --git a/jscomp/bsb/bsb_main.ml b/jscomp/bsb/bsb_main.ml
@@ -93,10 +93,16 @@ let write_ninja_file cwd =
     let ochan = open_out_bin (builddir // sourcedirs_meta) in
     let lib_ocaml_dir = (bsc_dir // ".."//"lib"//"ocaml") in 
     let buffer = Buffer.create 100 in 
+    let () = 
+      Bsb_default.get_ppx_flags ()
+      |> List.iter (fun x -> 
+          Buffer.add_string buffer (Printf.sprintf "PPX %s\n" x )
+        )
+    in 
     let () = Buffer.add_string buffer
         (Printf.sprintf "S %s\n\
                          B %s\n\
-                         PPX %s\n
+                         PPX %s\n\
                        " lib_ocaml_dir lib_ocaml_dir bsppx
         ) in 
     let () =