remove magic number for cmj too

every time we bump the version, ast got to be rebuilt, trigger cmj rebuilt
another protection: it will be removed

Author: bobzhang

jscomp/core/js_cmj_format.ml

@@ -72,47 +72,33 @@ let make
   }
 
 
-let verify_magic_in_beg ic =
-  let buffer = really_input_string ic Ext_cmj_magic.cmj_magic_number_length in 
-  if buffer <> Ext_cmj_magic.cmj_magic_number then
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s" 
-        __LOC__
 
 
 (* Serialization .. *)
 let from_file name : t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let _digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v 
 
 let from_file_with_digest name : t * Digest.t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v,digest 
 
 
 let from_string s : t = 
-  let magic_number = String.sub s 0 Ext_cmj_magic.cmj_magic_number_length in 
-  if magic_number = Ext_cmj_magic.cmj_magic_number then 
-    Marshal.from_string s  Ext_cmj_magic.header_length
-  else 
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s"
-        __LOC__
+    Marshal.from_string s  Ext_digest.length
 
 
 let for_sure_not_changed (name : string) (header : string) =   
   if Sys.file_exists name then 
     let ic = open_in_bin name in 
     let holder =
-      really_input_string ic Ext_cmj_magic.header_length in 
+      really_input_string ic Ext_digest.length in 
     close_in ic; 
     holder = header
   else false  
@@ -123,7 +109,7 @@ let for_sure_not_changed (name : string) (header : string) =
 let to_file name ~check_exists (v : t) = 
   let s = Marshal.to_string v [] in 
   let cur_digest = Digest.string s in 
-  let header = Ext_cmj_magic.cmj_magic_number ^ cur_digest in 
+  let header =  cur_digest in 
   if  not (check_exists && for_sure_not_changed name header) then 
     let oc = open_out_bin name in 
     output_string oc header;    

jscomp/ext/ext_cmj_magic.ml

@@ -95423,10 +95423,9 @@ let ffi_obj_create obj_params =
 let ffi_obj_as_prims obj_params = 
   ["";to_string (Ffi_obj_create obj_params)]
 end
-module Ext_cmj_magic
-= struct
-#1 "ext_cmj_magic.ml"
-(* Copyright (C) 2020 Authors of BuckleScript
+module Ext_digest : sig 
+#1 "ext_digest.mli"
+(* Copyright (C) 2019- Authors of BuckleScript
  * 
  * 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
@@ -95451,16 +95450,39 @@ module Ext_cmj_magic
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-let cmj_magic_number =  "BUCKLE20200209"
-let cmj_magic_number_length = 
-  String.length cmj_magic_number
-
+ val length : int 
 
+ val hex_length : int
+end = struct
+#1 "ext_digest.ml"
+(* Copyright (C) 2019- Authors of BuckleScript
+ * 
+ * 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 digest_length = 16 (*16 chars *)
 
-let header_length = cmj_magic_number_length + digest_length
+ let length = 16
 
+ let hex_length = 32
 end
 module Lam_primitive : sig 
 #1 "lam_primitive.mli"
@@ -97388,47 +97410,33 @@ let make
   }
 
 
-let verify_magic_in_beg ic =
-  let buffer = really_input_string ic Ext_cmj_magic.cmj_magic_number_length in 
-  if buffer <> Ext_cmj_magic.cmj_magic_number then
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s" 
-        __LOC__
 
 
 (* Serialization .. *)
 let from_file name : t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let _digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v 
 
 let from_file_with_digest name : t * Digest.t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v,digest 
 
 
 let from_string s : t = 
-  let magic_number = String.sub s 0 Ext_cmj_magic.cmj_magic_number_length in 
-  if magic_number = Ext_cmj_magic.cmj_magic_number then 
-    Marshal.from_string s  Ext_cmj_magic.header_length
-  else 
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s"
-        __LOC__
+    Marshal.from_string s  Ext_digest.length
 
 
 let for_sure_not_changed (name : string) (header : string) =   
   if Sys.file_exists name then 
     let ic = open_in_bin name in 
     let holder =
-      really_input_string ic Ext_cmj_magic.header_length in 
+      really_input_string ic Ext_digest.length in 
     close_in ic; 
     holder = header
   else false  
@@ -97439,7 +97447,7 @@ let for_sure_not_changed (name : string) (header : string) =
 let to_file name ~check_exists (v : t) = 
   let s = Marshal.to_string v [] in 
   let cur_digest = Digest.string s in 
-  let header = Ext_cmj_magic.cmj_magic_number ^ cur_digest in 
+  let header =  cur_digest in 
   if  not (check_exists && for_sure_not_changed name header) then 
     let oc = open_out_bin name in 
     output_string oc header;