From 519ca9a8e555953fae5a83de7b164ed15c525cbd Mon Sep 17 00:00:00 2001 From: Mark Shinwell Date: Tue, 7 May 2024 19:38:23 +0100 Subject: [PATCH] Bump magic numbers for minus-14 (#2547) * Stop using upstream build in bump_magic_numbers.sh * Bump magic numbers for minus-14 --- ocaml/runtime/caml/exec.h | 2 +- ocaml/runtime4/caml/exec.h | 2 +- ocaml/utils/config.common.ml | 26 +++++++++++++------------- tools/bump_magic_numbers.sh | 4 ---- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/ocaml/runtime/caml/exec.h b/ocaml/runtime/caml/exec.h index 00942fbcb55..7223d17199d 100644 --- a/ocaml/runtime/caml/exec.h +++ b/ocaml/runtime/caml/exec.h @@ -60,7 +60,7 @@ struct exec_trailer { /* Magic number for this release */ -#define EXEC_MAGIC "Caml1999X528" +#define EXEC_MAGIC "Caml1999X529" #endif /* CAML_INTERNALS */ diff --git a/ocaml/runtime4/caml/exec.h b/ocaml/runtime4/caml/exec.h index 00942fbcb55..7223d17199d 100644 --- a/ocaml/runtime4/caml/exec.h +++ b/ocaml/runtime4/caml/exec.h @@ -60,7 +60,7 @@ struct exec_trailer { /* Magic number for this release */ -#define EXEC_MAGIC "Caml1999X528" +#define EXEC_MAGIC "Caml1999X529" #endif /* CAML_INTERNALS */ diff --git a/ocaml/utils/config.common.ml b/ocaml/utils/config.common.ml index cdb12c8eb69..3266b9eaf5f 100644 --- a/ocaml/utils/config.common.ml +++ b/ocaml/utils/config.common.ml @@ -31,28 +31,28 @@ let standard_library = (* When artifacts are incompatible with upstream OCaml, ocaml-jst uses magic numbers ending in 5xx. (The AST remains compatible, so use upstream numbers) *) -let exec_magic_number = "Caml1999X528" +let exec_magic_number = "Caml1999X529" (* exec_magic_number is duplicated in runtime/caml/exec.h *) -and cmi_magic_number = "Caml1999I528" -and cmo_magic_number = "Caml1999O528" -and cma_magic_number = "Caml1999A528" +and cmi_magic_number = "Caml1999I529" +and cmo_magic_number = "Caml1999O529" +and cma_magic_number = "Caml1999A529" and cmx_magic_number = if flambda || flambda2 then - "Caml2021y529" + "Caml2021y530" else - "Caml2021Y528" + "Caml2021Y529" and cmxa_magic_number = if flambda || flambda2 then - "Caml2021z529" + "Caml2021z530" else - "Caml2021Z528" + "Caml2021Z529" and ast_impl_magic_number = "Caml1999M033" and ast_intf_magic_number = "Caml1999N033" -and cmxs_magic_number = "Caml1999D528" -and cmt_magic_number = "Caml1999T528" -and cms_magic_number = "Caml1999S528" -and linear_magic_number = "Caml1999L528" -and cfg_magic_number = "Caml2021G528" +and cmxs_magic_number = "Caml1999D529" +and cmt_magic_number = "Caml1999T529" +and cms_magic_number = "Caml1999S529" +and linear_magic_number = "Caml1999L529" +and cfg_magic_number = "Caml2021G529" let safe_string = true let default_safe_string = true diff --git a/tools/bump_magic_numbers.sh b/tools/bump_magic_numbers.sh index b7e9edbc637..27ec8f79075 100755 --- a/tools/bump_magic_numbers.sh +++ b/tools/bump_magic_numbers.sh @@ -11,9 +11,6 @@ if [ "$(git status --porcelain --untracked-files=no)" != "" ]; then exit 1 fi -git clean -dfX -(cd ocaml && ./configure && make -j8 coldstart && make -j8 coreall) - # Unfortunately the "e" modifier appears not to work except for replacing # a whole line @@ -33,4 +30,3 @@ $sed -i \ -e 's/^ "Caml\([0-9][0-9][0-9][0-9]\)\([a-zA-Z]\)\(5[0-9][0-9]\)"/echo " \\"Caml\1\2$((\3 + 1))\\""/ge' \ ocaml/utils/config.common.ml -(cd ocaml && make -j8 coreall && make -j8 bootstrap)