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

@@ -1,5 +1,5 @@
 (executable
  ((name        main)
   (public_name jbuilder)
-  (libraries (unix jbuilder jbuilder_cmdliner))
+  (libraries (unix jbuilder cmdliner))
   (preprocess no_preprocessing)))

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

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

src/glob_lexer.mll

@@ -1,5 +1,4 @@
 {
-open Jbuilder_re
 open Re
 
 let no_slash        = diff any (char '/')

src/import.ml

@@ -1,5 +1,4 @@
 include Stdune
-include Jbuilder_re
 include Errors
 
 (* To make bug reports usable *)

src/jbuild

@@ -7,8 +7,8 @@
                 stdune
                 fiber
                 xdg
-                jbuilder_re
+                re
-                jbuilder_opam_file_format
+                opam_file_format
                 usexp
                 ocaml_config))
   (synopsis    "Internal Jbuilder library, do not use!")))

src/opam_file.ml

@@ -1,5 +1,4 @@
 open Import
-open Jbuilder_opam_file_format
 open OpamParserTypes
 
 type t = opamfile

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

src/watermarks.ml

@@ -1,6 +1,4 @@
 open Import
-open Jbuilder_opam_file_format
-
 open Fiber.O
 
 let is_a_source_file fn =

vendor/boot/jbuilder_opam_file_format.ml

@@ -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

vendor/boot/jbuilder_re.ml

@@ -1,6 +0,0 @@
-module Re = struct
-  type t = unit
-  type re = unit
-  let compile () = ()
-  let execp _ _ = false
-end

vendor/boot/opamBaseParser.ml

@@ -0,0 +1,6 @@
+open OpamParserTypes
+let main _lex _lexbuf fn =
+  assert (fn = "jbuilder.opam");
+  { file_contents = []
+  ; file_name     = fn
+  }

vendor/boot/opamLexer.ml

@@ -0,0 +1,2 @@
+exception Error of string
+let token _ = assert false

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
+  }

vendor/boot/re.ml

@@ -0,0 +1,4 @@
+type t = unit
+type re = unit
+let compile () = ()
+let execp _ _ = false

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))))

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))

vendor/re/src/jbuild

@@ -1,7 +1,6 @@
 (jbuild_version 1)
 
 (library
- ((name        jbuilder_re)
+ ((name     re)
-;;  (public_name jbuilder.re)
+  (flags    (:standard -w -50))
-  (flags (:standard -w -50))
+  (synopsis "Internal Jbuilder library, do not use!")))
-  (synopsis    "Internal Jbuilder library, do not use!")))