Skip to content

Commit

Permalink
Merge sherlodoc into Odoc repository
Browse files Browse the repository at this point in the history
This will make maintaining both Odoc and Sherlodoc easier.

Sherlodoc's website is not included and is intended to be maintained
separately.
  • Loading branch information
Julow committed Dec 13, 2024
1 parent a8ac275 commit 14bff51
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 82 deletions.
8 changes: 7 additions & 1 deletion dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
"Leo White <leo@lpw25.net>"
"Lubega Simon <lubegasimon73@gmail.com>"
"Paul-Elliot Angl\195\168s d'Auriac <paul-elliot@tarides.com>"
"Thomas Refis <trefis@janestreet.com>")
"Thomas Refis <trefis@janestreet.com>"
"Arthur Wendling <art.wendling@gmail.com>"
"Emile Trotignon <emile.trotignon@gmail.com>")

(maintainers
"Daniel B\195\188nzli <daniel.buenzli@erratique.ch>"
Expand All @@ -29,3 +31,7 @@
(cram enable)

(using mdx 0.3)

; Sherlodoc
(using menhir 2.1)
(using directory-targets 0.1)
1 change: 1 addition & 0 deletions odoc-driver.opam
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ depends: [
"cmdliner"
"sexplib"
"ppx_sexp_conv"
"sherlodoc"
]

build: [
Expand Down
10 changes: 5 additions & 5 deletions sherlodoc/sherlodoc.opam → sherlodoc.opam
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# This file is generated by dune, edit dune-project instead
opam-version: "2.0"
version: "0.2"
version: "dev"
synopsis: "Search engine for OCaml documentation"
maintainer: ["art.wendling@gmail.com"]
authors: ["Arthur Wendling" "Emile Trotignon"]
license: "MIT"
homepage: "https://github.com/art-w/sherlodoc"
bug-reports: "https://github.com/art-w/sherlodoc/issues"
homepage: "https://github.com/ocaml/odoc"
doc: "https://ocaml.github.io/odoc/"
bug-reports: "https://github.com/ocaml/odoc/issues"
depends: [
"dune" {>= "3.5"}
"ocaml" {>= "4.0.8"}
Expand Down Expand Up @@ -44,4 +44,4 @@ build: [
"@doc" {with-doc}
]
]
dev-repo: "git+https://github.com/art-w/sherlodoc.git"
dev-repo: "git+https://github.com/ocaml/odoc.git"
21 changes: 0 additions & 21 deletions sherlodoc/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions sherlodoc/.vscode/settings.json

This file was deleted.

45 changes: 0 additions & 45 deletions sherlodoc/dune-project

This file was deleted.

3 changes: 0 additions & 3 deletions sherlodoc/dune-workspace

This file was deleted.

3 changes: 2 additions & 1 deletion src/driver/dune
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
(package odoc-driver)
(link_deps
(package odoc)
(package odoc-md))
(package odoc-md)
%{bin:sherlodoc})
(preprocess
(pps ppx_sexp_conv))
(libraries
Expand Down

0 comments on commit 14bff51

Please sign in to comment.