diff options
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/coqide.opam | 12 | ||||
| -rw-r--r-- | ide/dune-workspace | 6 | ||||
| -rw-r--r-- | ide/preferences.ml | 6 | ||||
| -rw-r--r-- | ide/protocol/xml_lexer.mll | 5 |
4 files changed, 15 insertions, 14 deletions
diff --git a/ide/coqide.opam b/ide/coqide.opam index ba05b9edcf..897177b283 100644 --- a/ide/coqide.opam +++ b/ide/coqide.opam @@ -6,14 +6,16 @@ bug-reports: "https://github.com/coq/coq/issues" dev-repo: "https://github.com/coq/coq.git" license: "LGPL-2.1" -available: [ocaml-version >= "4.02.3"] +available: [ocaml-version >= "4.05.0"] depends: [ - "dune" { build } - "ocamlfind" { build } - "num" - "camlp5" + "dune" { build & >= "1.2.0" } "coq" + "conf-gtksourceview" + "lablgtk" { >= "2.18.5" } ] +build-env: [ + [ COQ_CONFIGURE_PREFIX = "%{prefix}" ] +] build: [ [ "dune" "build" "-p" name "-j" jobs ] ] diff --git a/ide/dune-workspace b/ide/dune-workspace new file mode 100644 index 0000000000..38875eac2c --- /dev/null +++ b/ide/dune-workspace @@ -0,0 +1,6 @@ +(lang dune 1.2) + +; Add custom flags here. Default developer profile is `dev` +(env + (dev (flags :standard -rectypes -w -9-27-50+60)) + (release (flags :standard -rectypes))) diff --git a/ide/preferences.ml b/ide/preferences.ml index 3f10af04c9..9f04ced1c3 100644 --- a/ide/preferences.ml +++ b/ide/preferences.ml @@ -688,10 +688,6 @@ let pmodifiers ?(all = false) name p = modifiers name (str_to_mod_list p#get) -[@@@ocaml.warning "-3"] (* String.uppercase_ascii since 4.03.0 GPR#124 *) -let uppercase = String.uppercase -[@@@ocaml.warning "+3"] - let configure ?(apply=(fun () -> ())) () = let cmd_coqtop = string @@ -1018,7 +1014,7 @@ let configure ?(apply=(fun () -> ())) () = let k = if Int.equal (CString.length k) 1 && Util.is_letter k.[0] then k else "" in - let k = uppercase k in + let k = String.uppercase_ascii k in [q, k] in diff --git a/ide/protocol/xml_lexer.mll b/ide/protocol/xml_lexer.mll index 4a52147e17..e8bf7e16ae 100644 --- a/ide/protocol/xml_lexer.mll +++ b/ide/protocol/xml_lexer.mll @@ -83,9 +83,6 @@ let error lexbuf e = last_pos := lexeme_start lexbuf; raise (Error e) -[@@@ocaml.warning "-3"] (* String.lowercase_ascii since 4.03.0 GPR#124 *) -let lowercase = String.lowercase -[@@@ocaml.warning "+3"] } let newline = ['\n'] @@ -222,7 +219,7 @@ and entity = parse { let ident = lexeme lexbuf in try - Hashtbl.find idents (lowercase ident) + Hashtbl.find idents (String.lowercase_ascii ident) with Not_found -> "&" ^ ident } |