Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

renamed opalang_git into opa_git

  • Loading branch information...
commit 71d48a29ebf49f2c6b8946bfccb7a9ef44305a11 1 parent f5c37c7
@Aqua-Ye Aqua-Ye authored
View
8 compiler/buildinfos/buildInfos.ml.post
@@ -1,11 +1,11 @@
(* this is the post infos *)
let git_version_counter =
- opalang_git_version
+ opa_git_version
let version_id = Printf.sprintf "%d-(%s)"
git_version_counter
- opalang_git_sha
+ opa_git_sha
let assert_minimal_version s =
let check_int version =
@@ -17,7 +17,7 @@ let assert_minimal_version s =
*)
true
else
- version <= opalang_git_version
+ version <= opa_git_version
in
try
let version = int_of_string s in
@@ -51,7 +51,7 @@ let assert_maximal_version s =
*)
false
else
- version >= opalang_git_version
+ version >= opa_git_version
in
try
let version = int_of_string s in
View
4 compiler/buildinfos/buildInfos.mli
@@ -60,7 +60,7 @@ val opa_version_name : string
*)
(** *)
-val opalang_git_version : int
+val opa_git_version : int
(**
Git sha of HEAD. A string indicated the short sha of the last commit.
@@ -72,7 +72,7 @@ val opalang_git_version : int
]}
*)
(** *)
-val opalang_git_sha : string
+val opa_git_sha : string
(** {6 Date} *)
View
6 compiler/buildinfos/generate_buildinfos.sh
@@ -141,11 +141,11 @@ for repo in $REPOS ; do
echo "let ${repo}_git_sha = \"\""
else
if [ "$repo" = "$ROOT_REPO" ] ; then
- echo "let ${repo}_git_version = $(in_repo $repo git_opalang_version_cmd)"
+ echo "let opa_git_version = $(in_repo $repo git_opalang_version_cmd)"
else
- echo "let ${repo}_git_version = $(in_repo $repo git_version_cmd)"
+ echo "let opa_git_version = $(in_repo $repo git_version_cmd)"
fi
- echo "let ${repo}_git_sha = \"$(in_repo $repo git_sha_cmd)\""
+ echo "let opa_git_sha = \"$(in_repo $repo git_sha_cmd)\""
fi
done
echo
View
2  compiler/compilerlib/objectFiles.ml
@@ -332,7 +332,7 @@ let is_separated () = !separated <> `no
(*----- a few utils -------*)
(*-------------------------*)
(* for simplicity, every time the compiler changes, the object files are invalid *)
-let this_file_version = BuildInfos.opalang_git_sha
+let this_file_version = BuildInfos.opa_git_sha
let opxdir = ref "."
let unprefixed_dirname (package:package_name) : filename = package ^ "." ^ Name.object_ext
let dirname (package:package_name) : filename = Filename.concat !opxdir (unprefixed_dirname package)
View
2  compiler/libbsl/bslMarshalPlugin.ml
@@ -160,7 +160,7 @@ let fail action filename message =
OManager.error "@[<2>@{<bright>Hint@}:@\n%s@]@\n" message
(* for simplicity, every time the compiler changes, the object files are invalid *)
-let this_file_version = BuildInfos.opalang_git_sha
+let this_file_version = BuildInfos.opa_git_sha
(* I/O : beware, read the ocaml doc, Marshal should be used with binary
channel for a Windows OS compatibility *)
View
6 compiler/opalib/opaEnv.ml
@@ -425,7 +425,7 @@ struct
"Opa compiler (c) MLstate -- version %s -- build %d"
)
BuildInfos.opa_version_name
- BuildInfos.opalang_git_version
+ BuildInfos.opa_git_version
let print_version () = prerr_endline str_version
@@ -561,7 +561,7 @@ struct
)
s
BuildInfos.opa_version_name
- BuildInfos.opalang_git_version
+ BuildInfos.opa_git_version
| Some true -> ()
),
"<version> Ensure that the compiler is newer than the given version"
@@ -585,7 +585,7 @@ struct
)
s
BuildInfos.opa_version_name
- BuildInfos.opalang_git_version
+ BuildInfos.opa_git_version
| Some true -> ()
),
"<version> Ensure that the compiler is older than the given version"
View
4 compiler/passes/pass_CompileTimeDirective.ml
@@ -38,8 +38,8 @@ let infos_ident =
))
);
- "opa_git_version", (fun _ -> C.E.int BuildInfos.opalang_git_version);
- "opa_git_version_hash", (fun _ -> C.E.string BuildInfos.opalang_git_sha);
+ "opa_git_version", (fun _ -> C.E.int BuildInfos.opa_git_version);
+ "opa_git_version_hash", (fun _ -> C.E.string BuildInfos.opa_git_sha);
"opa_date", (fun _ -> C.E.string BuildInfos.date);
"opa_is_release", (fun _ -> C.E.bool BuildInfos.is_release);
]
Please sign in to comment.
Something went wrong with that request. Please try again.