use st_atime to work around npm issues, always record rescript.exe timestamp

Author: bobzhang

jscomp/bsb/bsb_ninja_check.ml

@@ -66,7 +66,7 @@ let rec check_aux cwd (xs : string list)  =
   match xs with 
   | [] -> Good
   | "===" :: rest ->
-    check_global rest 
+    check_global_atime rest 
   | item :: rest
     -> 
     match Ext_string.split item '\t' with 
@@ -78,7 +78,7 @@ let rec check_aux cwd (xs : string list)  =
         check_aux cwd rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
-and check_global rest = 
+and check_global_atime rest = 
   match rest with 
   | [] -> Good 
   | item :: rest ->
@@ -87,20 +87,22 @@ and check_global rest =
       let stamp = float_of_string stamp in 
       let cur_file = file in 
       let stat = Unix.stat cur_file in 
-      if stat.st_mtime <> stamp then 
-        check_global rest 
+      if stat.st_atime <= stamp then 
+        check_global_atime rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
 
 
 (* TODO: for such small data structure, maybe text format is better *)
 
-
+let record_global_atime buf name = 
+  let stamp = (Unix.stat name).st_atime in 
+  Ext_buffer.add_string_char buf name '\t';
+  Ext_buffer.add_string_char buf (hex_of_float stamp) '\n'   
 let record 
     ~(package_kind : Bsb_package_kind.t)
     ~per_proj_dir ~file  
     ~(config:Bsb_config_types.t) (file_or_dirs : string list) : unit =
-  let _ = config in 
   let buf = Ext_buffer.create 1_000 in   
   Ext_buffer.add_string_char buf Bs_version.version '\n';  
   Ext_buffer.add_string_char buf per_proj_dir '\n';
@@ -114,17 +116,13 @@ let record
       Ext_buffer.add_string_char buf 
         (hex_of_float (Unix.stat (Filename.concat per_proj_dir f)).st_mtime) '\n'; 
     );
-  begin match config.ppx_files with 
-    | [] -> ()
-    | files ->
-      Ext_buffer.add_string buf "===\n";
-      Ext_list.iter files (fun {name ; args = _} -> 
-          try
-            let stamp = (Unix.stat name).st_mtime in 
-            Ext_buffer.add_string_char buf name '\t';
-            Ext_buffer.add_string_char buf (hex_of_float stamp) '\n' 
-          with  _ -> ())
-  end;      
+  Ext_buffer.add_string buf "===\n";
+  record_global_atime buf Sys.executable_name;
+  Ext_list.iter config.ppx_files (fun {name ; args = _} -> 
+      try
+        record_global_atime buf name
+      with  _ -> (* record the ppx files as a best effort *)
+        ());      
   let oc = open_out_bin file in
   Ext_buffer.output_buffer oc buf ;
   close_out oc    

jscomp/bsb/bsb_ninja_regen.ml

@@ -42,8 +42,6 @@ let regenerate_ninja
       ~package_kind
       ~per_proj_dir
       ~forced ~file:output_deps in
-  Bsb_log.info
-    "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result ;
   match check_result  with 
   | Good ->
     None  (* Fast path, no need regenerate ninja *)
@@ -54,6 +52,8 @@ let regenerate_ninja
   | Bsb_file_not_exist 
   | Bsb_source_directory_changed  
   | Other _ -> 
+    Bsb_log.info
+      "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result;
     if check_result = Bsb_bsc_version_mismatch then begin 
       Bsb_log.warn "@{<info>Different compiler version@}: clean current repo@.";
       Bsb_clean.clean_self  per_proj_dir; 

lib/4.06.1/bsb.ml

@@ -12180,7 +12180,7 @@ let rec check_aux cwd (xs : string list)  =
   match xs with 
   | [] -> Good
   | "===" :: rest ->
-    check_global rest 
+    check_global_atime rest 
   | item :: rest
     -> 
     match Ext_string.split item '\t' with 
@@ -12192,7 +12192,7 @@ let rec check_aux cwd (xs : string list)  =
         check_aux cwd rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
-and check_global rest = 
+and check_global_atime rest = 
   match rest with 
   | [] -> Good 
   | item :: rest ->
@@ -12201,20 +12201,22 @@ and check_global rest =
       let stamp = float_of_string stamp in 
       let cur_file = file in 
       let stat = Unix.stat cur_file in 
-      if stat.st_mtime <> stamp then 
-        check_global rest 
+      if stat.st_atime <= stamp then 
+        check_global_atime rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
 
 
 (* TODO: for such small data structure, maybe text format is better *)
 
-
+let record_global_atime buf name = 
+  let stamp = (Unix.stat name).st_atime in 
+  Ext_buffer.add_string_char buf name '\t';
+  Ext_buffer.add_string_char buf (hex_of_float stamp) '\n'   
 let record 
     ~(package_kind : Bsb_package_kind.t)
     ~per_proj_dir ~file  
     ~(config:Bsb_config_types.t) (file_or_dirs : string list) : unit =
-  let _ = config in 
   let buf = Ext_buffer.create 1_000 in   
   Ext_buffer.add_string_char buf Bs_version.version '\n';  
   Ext_buffer.add_string_char buf per_proj_dir '\n';
@@ -12228,17 +12230,13 @@ let record
       Ext_buffer.add_string_char buf 
         (hex_of_float (Unix.stat (Filename.concat per_proj_dir f)).st_mtime) '\n'; 
     );
-  begin match config.ppx_files with 
-    | [] -> ()
-    | files ->
-      Ext_buffer.add_string buf "===\n";
-      Ext_list.iter files (fun {name ; args = _} -> 
-          try
-            let stamp = (Unix.stat name).st_mtime in 
-            Ext_buffer.add_string_char buf name '\t';
-            Ext_buffer.add_string_char buf (hex_of_float stamp) '\n' 
-          with  _ -> ())
-  end;      
+  Ext_buffer.add_string buf "===\n";
+  record_global_atime buf Sys.executable_name;
+  Ext_list.iter config.ppx_files (fun {name ; args = _} -> 
+      try
+        record_global_atime buf name
+      with  _ -> (* record the ppx files as a best effort *)
+        ());      
   let oc = open_out_bin file in
   Ext_buffer.output_buffer oc buf ;
   close_out oc    
@@ -14163,8 +14161,6 @@ let regenerate_ninja
       ~package_kind
       ~per_proj_dir
       ~forced ~file:output_deps in
-  Bsb_log.info
-    "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result ;
   match check_result  with 
   | Good ->
     None  (* Fast path, no need regenerate ninja *)
@@ -14175,6 +14171,8 @@ let regenerate_ninja
   | Bsb_file_not_exist 
   | Bsb_source_directory_changed  
   | Other _ -> 
+    Bsb_log.info
+      "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result;
     if check_result = Bsb_bsc_version_mismatch then begin 
       Bsb_log.warn "@{<info>Different compiler version@}: clean current repo@.";
       Bsb_clean.clean_self  per_proj_dir; 

lib/4.06.1/rescript.ml

@@ -12180,7 +12180,7 @@ let rec check_aux cwd (xs : string list)  =
   match xs with 
   | [] -> Good
   | "===" :: rest ->
-    check_global rest 
+    check_global_atime rest 
   | item :: rest
     -> 
     match Ext_string.split item '\t' with 
@@ -12192,7 +12192,7 @@ let rec check_aux cwd (xs : string list)  =
         check_aux cwd rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
-and check_global rest = 
+and check_global_atime rest = 
   match rest with 
   | [] -> Good 
   | item :: rest ->
@@ -12201,20 +12201,22 @@ and check_global rest =
       let stamp = float_of_string stamp in 
       let cur_file = file in 
       let stat = Unix.stat cur_file in 
-      if stat.st_mtime <> stamp then 
-        check_global rest 
+      if stat.st_atime <= stamp then 
+        check_global_atime rest 
       else Other  cur_file
     | _ -> Bsb_file_corrupted 
 
 
 (* TODO: for such small data structure, maybe text format is better *)
 
-
+let record_global_atime buf name = 
+  let stamp = (Unix.stat name).st_atime in 
+  Ext_buffer.add_string_char buf name '\t';
+  Ext_buffer.add_string_char buf (hex_of_float stamp) '\n'   
 let record 
     ~(package_kind : Bsb_package_kind.t)
     ~per_proj_dir ~file  
     ~(config:Bsb_config_types.t) (file_or_dirs : string list) : unit =
-  let _ = config in 
   let buf = Ext_buffer.create 1_000 in   
   Ext_buffer.add_string_char buf Bs_version.version '\n';  
   Ext_buffer.add_string_char buf per_proj_dir '\n';
@@ -12228,17 +12230,13 @@ let record
       Ext_buffer.add_string_char buf 
         (hex_of_float (Unix.stat (Filename.concat per_proj_dir f)).st_mtime) '\n'; 
     );
-  begin match config.ppx_files with 
-    | [] -> ()
-    | files ->
-      Ext_buffer.add_string buf "===\n";
-      Ext_list.iter files (fun {name ; args = _} -> 
-          try
-            let stamp = (Unix.stat name).st_mtime in 
-            Ext_buffer.add_string_char buf name '\t';
-            Ext_buffer.add_string_char buf (hex_of_float stamp) '\n' 
-          with  _ -> ())
-  end;      
+  Ext_buffer.add_string buf "===\n";
+  record_global_atime buf Sys.executable_name;
+  Ext_list.iter config.ppx_files (fun {name ; args = _} -> 
+      try
+        record_global_atime buf name
+      with  _ -> (* record the ppx files as a best effort *)
+        ());      
   let oc = open_out_bin file in
   Ext_buffer.output_buffer oc buf ;
   close_out oc    
@@ -14163,8 +14161,6 @@ let regenerate_ninja
       ~package_kind
       ~per_proj_dir
       ~forced ~file:output_deps in
-  Bsb_log.info
-    "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result ;
   match check_result  with 
   | Good ->
     None  (* Fast path, no need regenerate ninja *)
@@ -14175,6 +14171,8 @@ let regenerate_ninja
   | Bsb_file_not_exist 
   | Bsb_source_directory_changed  
   | Other _ -> 
+    Bsb_log.info
+      "@{<info>BSB check@} build spec : %a @." Bsb_ninja_check.pp_check_result check_result;
     if check_result = Bsb_bsc_version_mismatch then begin 
       Bsb_log.warn "@{<info>Different compiler version@}: clean current repo@.";
       Bsb_clean.clean_self  per_proj_dir;