tweaks

Author: bobzhang

jscomp/main/rescript_main.ml

@@ -30,11 +30,7 @@ let watch_mode = ref false
 let make_world = ref false 
 let do_install = ref false
 let force_regenerate = ref false
-let bs_version_string = Bs_version.version
-let print_version_string () = 
-  print_string bs_version_string;
-  print_newline (); 
-  exit 0 
+
 type spec = Bsb_arg.spec
 
 let call_spec f : spec = Unit (Unit_call f )
@@ -115,17 +111,7 @@ let install_target () =
   if eid <> 0 then   
     Bsb_unix.command_fatal_error install_command eid  
 
-let global_help () =  
-  print_string {|Available flags
--v, -version  display version number
--h, -help     display help 
-Subcommands:
-  build    
-  clean
-  help
-Run rescript subcommand -h for more details, for example
-  rescript build -h
-|}     
+
 
 let build_subcommand ~start  argv argv_len =
   let i =  Ext_array.rfind_with_index argv Ext_string.equal separator in   
@@ -243,23 +229,15 @@ let () =
         ~per_proj_dir:Bsb_global_paths.cwd  |> ignore;
       ninja_command_exit  [||] 
     end else
-
-
-
       match argv.(1) with 
-      | "-version" | "-v"
-        -> print_version_string ()
-      | "-help" | "-h"
-        -> global_help ()
       | "build" -> 
         build_subcommand ~start:2 argv argv_len
       | "clean" ->         
         clean_subcommand ~start:2 argv      
       | "init" ->  
         init_subcommand ~start:2 argv 
-      | "info" ->
+      | "info" -> (* internal *)
         info_subcommand ~start:2 argv   
-      | "help" -> global_help ()
       | first_arg -> 
         prerr_endline @@ "Unknown subcommand or flags: " ^ first_arg;
         exit 1

lib/4.06.1/rescript.ml

@@ -1,66 +1,3 @@
-module Bs_version : sig 
-#1 "bs_version.mli"
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-
-val version : string
-
-val header : string 
-
-val package_name : string ref
-end = struct
-#1 "bs_version.ml"
-
-(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * In addition to the permissions granted to you by the LGPL, you may combine
- * or link a "work that uses the Library" with a publicly distributed version
- * of this file to produce a combined library or application, then distribute
- * that combined work under the terms of your choosing, with no requirement
- * to comply with the obligations normally placed on you by section 4 of the
- * LGPL version 3 (or the corresponding section of a later version of the LGPL
- * should you choose to use a later version).
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
-let version = "9.1.0"
-let header =
-  "// Generated by ReScript, PLEASE EDIT WITH CARE"
-let package_name = ref "bs-platform"
-
-end
 module Ext_array : sig 
 #1 "ext_array.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -5942,6 +5879,69 @@ let proj_rel path = rev_lib_bs // path
 (* let cmd_package_specs = ref None  *)
 
 
+end
+module Bs_version : sig 
+#1 "bs_version.mli"
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+
+val version : string
+
+val header : string 
+
+val package_name : string ref
+end = struct
+#1 "bs_version.ml"
+
+(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
+let version = "9.1.0"
+let header =
+  "// Generated by ReScript, PLEASE EDIT WITH CARE"
+let package_name = ref "bs-platform"
+
 end
 module Bsb_pkg_types : sig 
 #1 "bsb_pkg_types.mli"
@@ -16597,11 +16597,7 @@ let watch_mode = ref false
 let make_world = ref false 
 let do_install = ref false
 let force_regenerate = ref false
-let bs_version_string = Bs_version.version
-let print_version_string () = 
-  print_string bs_version_string;
-  print_newline (); 
-  exit 0 
+
 type spec = Bsb_arg.spec
 
 let call_spec f : spec = Unit (Unit_call f )
@@ -16682,17 +16678,7 @@ let install_target () =
   if eid <> 0 then   
     Bsb_unix.command_fatal_error install_command eid  
 
-let global_help () =  
-  print_string {|Available flags
--v, -version  display version number
--h, -help     display help 
-Subcommands:
-  build    
-  clean
-  help
-Run rescript subcommand -h for more details, for example
-  rescript build -h
-|}     
+
 
 let build_subcommand ~start  argv argv_len =
   let i =  Ext_array.rfind_with_index argv Ext_string.equal separator in   
@@ -16810,23 +16796,15 @@ let () =
         ~per_proj_dir:Bsb_global_paths.cwd  |> ignore;
       ninja_command_exit  [||] 
     end else
-
-
-
       match argv.(1) with 
-      | "-version" | "-v"
-        -> print_version_string ()
-      | "-help" | "-h"
-        -> global_help ()
       | "build" -> 
         build_subcommand ~start:2 argv argv_len
       | "clean" ->         
         clean_subcommand ~start:2 argv      
       | "init" ->  
         init_subcommand ~start:2 argv 
-      | "info" ->
+      | "info" -> (* internal *)
         info_subcommand ~start:2 argv   
-      | "help" -> global_help ()
       | first_arg -> 
         prerr_endline @@ "Unknown subcommand or flags: " ^ first_arg;
         exit 1

rescript

@@ -108,8 +108,6 @@ Please pick a different one using the \`-ws [host:]port\` flag from bsb.`);
  */
 var delegate_args = [];
 var process_argv = process.argv;
-var maybe_subcommand = process_argv[2];
-var isInBuildMode = maybe_subcommand === "build";
 
 if (process.env.NINJA_ANSI_FORCED === undefined) {
   if (require("tty").isatty(1)) {
@@ -118,9 +116,33 @@ if (process.env.NINJA_ANSI_FORCED === undefined) {
 } else {
   dlog(`NINJA_ANSI_FORCED: "${process.env.NINJA_ANSI_FORCED}"`);
 }
+function help() {
+  console.log(`Available flags
+-v, -version  display version number
+-h, -help     display help 
+Subcommands:
+    build    
+    clean
+    format
+    convert
+    help
+Run rescript subcommand -h for more details,
+For example:
+    rescript build -h
+    rescript format -h
+  `);
+}
+
+var maybe_subcommand = process_argv[2];
 
-var delegate_args = process_argv.slice(2);
-if (!isInBuildMode) {
+if (
+  maybe_subcommand !== undefined &&
+  maybe_subcommand !== "build" &&
+  maybe_subcommand !== "clean" &&
+  maybe_subcommand !== "init" &&
+  maybe_subcommand !== "info"
+  // delegate to native
+) {
   var bsc_exe = path.join(__dirname, process.platform, "bsc.exe");
   switch (maybe_subcommand) {
     case "format":
@@ -138,21 +160,22 @@ if (!isInBuildMode) {
         bsc_exe
       );
       break;
+    case "-h":
+    case "-help":
+    case "help":
+      help();
+      break;
+    case "-v":
+    case "-version":
+      console.log(require("./package.json").version);
+      break;
     default:
-      try {
-        child_process.execFileSync(bsb_exe, delegate_args, {
-          stdio: "inherit",
-        });
-      } catch (e) {
-        if (e.code === "ENOENT") {
-          // when rescript is not found
-          console.log(String(e));
-          process.exit(2);
-        }
-      }
-      process.exit(0);
+      console.error(`Unknown subcommand or flags: ${maybe_subcommand}`);
+      help();
+      process.exit(2);
   }
 } else {
+  var delegate_args = process_argv.slice(2);
   var watch_mode = delegate_args.includes("-w");
   verbose = delegate_args.includes("-verbose");