Merge pull request #4179 from BuckleScript/bs_config

remove bsppx, use "bsc.exe -as-pppx"

Author: bobzhang

.gitignore

@@ -66,7 +66,7 @@ odoc_gen/*.cmxs
 
 # for npm publish
 *.exe
-!bin/bsppx
+
 !bin/bspack
 !/bin/bsb
 !/bin/bsc

jscomp/.merlin

@@ -37,6 +37,6 @@ B +compiler-libs
 # S test
 # B test
 
-# FLG -ppx /Users/hongbozhang/git/ocamlscript/lib/bsppx.exe
+
 
 FLG -w -40-30+6-23

jscomp/artifacts.json

@@ -24,7 +24,6 @@
     "bsb_helper.exe",
     "bsb.exe",
     "bsc.exe",
-    "bsppx.exe",
     "ninja.exe",
     "refmt.exe"
   ],
@@ -56,12 +55,10 @@
   "lib/4.06.1": [
     "bsb_helper.ml",
     "bsb.ml",
-    "bsppx.ml",
     "refmt_main3.ml",
     "whole_compiler.ml",
     "bsb_helper.mli",
     "bsb.mli",
-    "bsppx.mli",
     "refmt_main3.mli",
     "whole_compiler.mli"
   ],
@@ -1090,7 +1087,6 @@
     "bsb_helper.exe",
     "bsb.exe",
     "bsc.exe",
-    "bsppx.exe",
     "ninja.exe",
     "refmt.exe"
   ],
@@ -1130,8 +1126,7 @@
     "ninja.COPYING",
     "bsb_helper.exe",
     "bsb.exe",
-    "bsc.exe",
-    "bsppx.exe",
+    "bsc.exe",    
     "ninja.exe",
     "refmt.exe"
   ]

jscomp/bsb/bsb_global_paths.ml

@@ -61,8 +61,6 @@ let vendor_bsdep =
   Filename.concat bsc_dir "bsb_helper.exe"
 
 
-let vendor_bsppx = 
-  Filename.concat bsc_dir "bsppx.exe"
 
 ;; assert (Sys.file_exists bsc_dir)       
 

jscomp/bsb/bsb_global_paths.mli

@@ -33,8 +33,6 @@ val vendor_ninja : string
 
 val vendor_bsdep : string
 
-val vendor_bsppx : string
-
 val ocaml_dir : string
 
 val ocaml_lib_dir : string

jscomp/bsb/bsb_merlin_gen.ml

@@ -99,7 +99,6 @@ let warning_to_merlin_flg (warning: Bsb_warning.t ) : string=
 
 
 let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
-    built_in_ppx
     ({file_groups = res_files ; 
       generate_merlin;
       ppx_files;
@@ -136,14 +135,18 @@ let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
     Buffer.add_string buffer 
       (merlin_flg_ppx  ^ 
        (match reason_react_jsx with 
-        | None -> built_in_ppx
+        | None -> 
+          let fmt : _ format = 
+            if Ext_sys.is_windows_or_cygwin then
+              "\"%s -as-ppx \"" 
+            else  "'%s -as-ppx '"  in Printf.sprintf fmt Bsb_global_paths.vendor_bsc
         | Some opt ->
           let fmt : _ format = 
             if Ext_sys.is_windows_or_cygwin then
-              "\"%s -bs-jsx %d\"" 
-            else  "'%s -bs-jsx %d'" 
+              "\"%s -as-ppx -bs-jsx %d\"" 
+            else  "'%s -as-ppx -bs-jsx %d'" 
           in 
-          Printf.sprintf fmt  built_in_ppx        
+          Printf.sprintf fmt  Bsb_global_paths.vendor_bsc
             (match opt with Jsx_v2 -> 2 | Jsx_v3 -> 3)
        )
       );    

jscomp/bsb/bsb_merlin_gen.mli

@@ -26,4 +26,6 @@
 
 
 val merlin_file_gen : 
-    per_proj_dir:string -> string  -> Bsb_config_types.t ->  unit 
+  per_proj_dir:string  -> 
+  Bsb_config_types.t ->  
+  unit 

jscomp/bsb/bsb_ninja_regen.ml

@@ -73,7 +73,7 @@ let regenerate_ninja
         config.file_groups
     ;
     Bsb_merlin_gen.merlin_file_gen ~per_proj_dir
-      (Bsb_global_paths.vendor_bsppx) config;       
+       config;       
     Bsb_ninja_gen.output_ninja_and_namespace_map 
       ~per_proj_dir  ~toplevel config ;             
 

jscomp/build_tests/unicode/.merlin

@@ -1,9 +1,9 @@
 ####{BSB GENERATED: NO EDIT
-FLG -ppx /Users/hongbozhang/git/bucklescript/lib/bsppx.exe
+FLG -ppx '/Users/hongbozhang/git/bucklescript/darwin/bsc.exe -as-ppx '
 S /Users/hongbozhang/git/bucklescript/jscomp/build_tests/node_modules/bs-platform/lib/ocaml
 B /Users/hongbozhang/git/bucklescript/jscomp/build_tests/node_modules/bs-platform/lib/ocaml
 FLG -nostdlib
-FLG -w -30-40+6+7+27+32..39+44+45+101
+FLG -w +a-4-9-40-41-42-50-61-102
 S 📕annotation
 B lib/bs/📕annotation
 S 📗block

jscomp/common/js_config.ml

@@ -116,3 +116,5 @@ let no_stdlib = ref false
 let no_export = ref false
 
 let record_as_js_object = ref false (* otherwise has an attribute *)
+
+let as_ppx = ref false