From 239ff0054e4a1a4d938f6edd7df7b79ebe7d9786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dimino?= Date: Tue, 24 Apr 2018 14:38:30 +0100 Subject: [PATCH] Remove jbuilder_ prefix for vendored libraries (#720) It's not useful since we are not installing them. Also unwrap libraries that are unwrapped upstream. --- bin/jbuild | 2 +- bin/main.ml | 4 ++-- src/glob_lexer.mli | 2 +- src/glob_lexer.mll | 1 - src/import.ml | 1 - src/jbuild | 4 ++-- src/opam_file.ml | 1 - src/opam_file.mli | 2 +- src/watermarks.ml | 2 -- vendor/boot/jbuilder_opam_file_format.ml | 27 ------------------------ vendor/boot/jbuilder_re.ml | 6 ------ vendor/boot/opamBaseParser.ml | 6 ++++++ vendor/boot/opamLexer.ml | 2 ++ vendor/boot/opamParserTypes.ml | 13 ++++++++++++ vendor/boot/re.ml | 4 ++++ vendor/cmdliner/src/jbuild | 5 +++-- vendor/opam-file-format/src/jbuild | 3 ++- vendor/re/src/jbuild | 7 +++--- 18 files changed, 40 insertions(+), 52 deletions(-) delete mode 100644 vendor/boot/jbuilder_opam_file_format.ml delete mode 100644 vendor/boot/jbuilder_re.ml create mode 100644 vendor/boot/opamBaseParser.ml create mode 100644 vendor/boot/opamLexer.ml create mode 100644 vendor/boot/opamParserTypes.ml create mode 100644 vendor/boot/re.ml diff --git a/bin/jbuild b/bin/jbuild index 978fa8c5..bfec6550 100644 --- a/bin/jbuild +++ b/bin/jbuild @@ -1,5 +1,5 @@ (executable ((name main) (public_name jbuilder) - (libraries (unix jbuilder jbuilder_cmdliner)) + (libraries (unix jbuilder cmdliner)) (preprocess no_preprocessing))) diff --git a/bin/main.ml b/bin/main.ml index 6aed5641..eddd8876 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -1,11 +1,11 @@ open Jbuilder open Import -open Jbuilder_cmdliner.Cmdliner +open Cmdliner open Fiber.O (* Things in src/ don't depend on cmdliner to speed up the bootstrap, so we set this reference here *) -let () = suggest_function := Jbuilder_cmdliner.Cmdliner_suggest.value +let () = suggest_function := Cmdliner_suggest.value type common = { debug_dep_path : bool diff --git a/src/glob_lexer.mli b/src/glob_lexer.mli index 066db21e..79611c4e 100644 --- a/src/glob_lexer.mli +++ b/src/glob_lexer.mli @@ -1,3 +1,3 @@ open Import -val parse_string : string -> (Jbuilder_re.Re.t, int * string) result +val parse_string : string -> (Re.t, int * string) result diff --git a/src/glob_lexer.mll b/src/glob_lexer.mll index 174d6f19..bbfd0fc3 100644 --- a/src/glob_lexer.mll +++ b/src/glob_lexer.mll @@ -1,5 +1,4 @@ { -open Jbuilder_re open Re let no_slash = diff any (char '/') diff --git a/src/import.ml b/src/import.ml index 0fe5989d..fd1640f2 100644 --- a/src/import.ml +++ b/src/import.ml @@ -1,5 +1,4 @@ include Stdune -include Jbuilder_re include Errors (* To make bug reports usable *) diff --git a/src/jbuild b/src/jbuild index c085e3af..386c991e 100644 --- a/src/jbuild +++ b/src/jbuild @@ -7,8 +7,8 @@ stdune fiber xdg - jbuilder_re - jbuilder_opam_file_format + re + opam_file_format usexp ocaml_config)) (synopsis "Internal Jbuilder library, do not use!"))) diff --git a/src/opam_file.ml b/src/opam_file.ml index f4ddc412..db518188 100644 --- a/src/opam_file.ml +++ b/src/opam_file.ml @@ -1,5 +1,4 @@ open Import -open Jbuilder_opam_file_format open OpamParserTypes type t = opamfile diff --git a/src/opam_file.mli b/src/opam_file.mli index 764c9360..ecb7a964 100644 --- a/src/opam_file.mli +++ b/src/opam_file.mli @@ -1,6 +1,6 @@ (** Parsing and interpretation of opam files *) -open Jbuilder_opam_file_format.OpamParserTypes +open OpamParserTypes (** Type of opam files *) type t = opamfile diff --git a/src/watermarks.ml b/src/watermarks.ml index c62cd90a..26827bea 100644 --- a/src/watermarks.ml +++ b/src/watermarks.ml @@ -1,6 +1,4 @@ open Import -open Jbuilder_opam_file_format - open Fiber.O let is_a_source_file fn = diff --git a/vendor/boot/jbuilder_opam_file_format.ml b/vendor/boot/jbuilder_opam_file_format.ml deleted file mode 100644 index bfa16388..00000000 --- a/vendor/boot/jbuilder_opam_file_format.ml +++ /dev/null @@ -1,27 +0,0 @@ -module OpamParserTypes = struct - type value = - | String of unit * string - | List of unit * value list - | Other - - type opamfile_item = - | Variable of unit * string * value - | Other - - type opamfile = - { file_contents : opamfile_item list - ; file_name : string - } -end -module OpamBaseParser = struct - open OpamParserTypes - let main _lex _lexbuf fn = - assert (fn = "jbuilder.opam"); - { file_contents = [] - ; file_name = fn - } -end -module OpamLexer = struct - exception Error of string - let token _ = assert false -end diff --git a/vendor/boot/jbuilder_re.ml b/vendor/boot/jbuilder_re.ml deleted file mode 100644 index 75b36ec1..00000000 --- a/vendor/boot/jbuilder_re.ml +++ /dev/null @@ -1,6 +0,0 @@ -module Re = struct - type t = unit - type re = unit - let compile () = () - let execp _ _ = false -end diff --git a/vendor/boot/opamBaseParser.ml b/vendor/boot/opamBaseParser.ml new file mode 100644 index 00000000..434b59b3 --- /dev/null +++ b/vendor/boot/opamBaseParser.ml @@ -0,0 +1,6 @@ +open OpamParserTypes +let main _lex _lexbuf fn = + assert (fn = "jbuilder.opam"); + { file_contents = [] + ; file_name = fn + } diff --git a/vendor/boot/opamLexer.ml b/vendor/boot/opamLexer.ml new file mode 100644 index 00000000..abaa5ca7 --- /dev/null +++ b/vendor/boot/opamLexer.ml @@ -0,0 +1,2 @@ +exception Error of string +let token _ = assert false diff --git a/vendor/boot/opamParserTypes.ml b/vendor/boot/opamParserTypes.ml new file mode 100644 index 00000000..668f388c --- /dev/null +++ b/vendor/boot/opamParserTypes.ml @@ -0,0 +1,13 @@ +type value = + | String of unit * string + | List of unit * value list + | Other + +type opamfile_item = + | Variable of unit * string * value + | Other + +type opamfile = + { file_contents : opamfile_item list + ; file_name : string + } diff --git a/vendor/boot/re.ml b/vendor/boot/re.ml new file mode 100644 index 00000000..34fce92c --- /dev/null +++ b/vendor/boot/re.ml @@ -0,0 +1,4 @@ +type t = unit +type re = unit +let compile () = () +let execp _ _ = false diff --git a/vendor/cmdliner/src/jbuild b/vendor/cmdliner/src/jbuild index 6198726d..850e23ae 100644 --- a/vendor/cmdliner/src/jbuild +++ b/vendor/cmdliner/src/jbuild @@ -1,6 +1,7 @@ (jbuild_version 1) (library - ((name jbuilder_cmdliner) + ((name cmdliner) (libraries (caml)) - (flags (-w -3-6-27-32-33-35-50 -open Caml)))) + (wrapped false) + (flags (-w -3-6-27-32-33-35-50 -open Caml)))) diff --git a/vendor/opam-file-format/src/jbuild b/vendor/opam-file-format/src/jbuild index 8e9094cd..b02de190 100644 --- a/vendor/opam-file-format/src/jbuild +++ b/vendor/opam-file-format/src/jbuild @@ -1,7 +1,8 @@ (jbuild_version 1) (library - ((name jbuilder_opam_file_format))) + ((name opam_file_format) + (wrapped false))) (ocamllex (opamLexer)) (ocamlyacc (opamBaseParser)) diff --git a/vendor/re/src/jbuild b/vendor/re/src/jbuild index b9fdf880..b24a23ef 100644 --- a/vendor/re/src/jbuild +++ b/vendor/re/src/jbuild @@ -1,7 +1,6 @@ (jbuild_version 1) (library - ((name jbuilder_re) -;; (public_name jbuilder.re) - (flags (:standard -w -50)) - (synopsis "Internal Jbuilder library, do not use!"))) + ((name re) + (flags (:standard -w -50)) + (synopsis "Internal Jbuilder library, do not use!")))