Skip to content

Commit

Permalink
Split vendored directory
Browse files Browse the repository at this point in the history
We need the ocaml lsp server to contain its own vendored directory. So
that we only deleted those directories at build time.

Signed-off-by: Rudi Grinberg <[email protected]>
  • Loading branch information
rgrinberg committed Oct 21, 2020
1 parent 6ea0044 commit 1014f2e
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
[submodule "vendor/merlin"]
path = vendor/merlin
path = ocaml-lsp-server/vendor/merlin
url = https://github.com/rgrinberg/merlin
branch = lsp
ignore = dirty
[submodule "vendor/cmdliner"]
path = vendor/cmdliner
path = ocaml-lsp-server/vendor/cmdliner
url = https://github.com/dbuenzli/cmdliner.git
[submodule "ocaml-syntax-shims"]
path = vendor/ocaml-syntax-shims
path = ocaml-lsp-server/vendor/ocaml-syntax-shims
url = https://github.com/ocaml-ppx/ocaml-syntax-shims
[submodule "vendor/uutf"]
path = vendor/uutf
path = ocaml-lsp-server/vendor/uutf
url = https://github.com/dune-universe/uutf.git
branch = duniverse-v1.0.2
[submodule "vendor/octavius"]
path = vendor/octavius
path = ocaml-lsp-server/vendor/octavius
url = https://github.com/ocaml-doc/octavius.git
ignore = dirty
[submodule "vendor/omd"]
path = vendor/omd
path = ocaml-lsp-server/vendor/omd
url = https://github.com/ulugbekna/omd.git
branch = ocaml-lsp
ignore = dirty
1 change: 1 addition & 0 deletions ocaml-lsp-server/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(vendored_dirs vendor)
2 changes: 1 addition & 1 deletion unvendor.ml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ let rec rm_rf path =
and clear path =
Sys.readdir path |> Array.iter (fun name -> rm_rf (Filename.concat path name))

let () = clear "./vendor"
let () = clear "./ocaml-lsp-server/vendor"

0 comments on commit 1014f2e

Please sign in to comment.