Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ NEXT_RELEASE:
as tweaking the C linker can be required for pure-OCaml projects -- see #236
(Gabriel Scherer, report by Nathan Rebours)

- #257, #259: add `_opam` to the list of directories ignored by default;
it is used for package-local opam switches
(Gabriel Scherer, request by Edwin Török)

0.11.0 (5 Mar 2017):
--------------------

Expand Down
2 changes: 1 addition & 1 deletion manual/manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ That means that if you want to add "foo/bar" (and its files) as part of the sour
"foo/baz": -traverse
----

If the option `-r` (for _recursive_) is passed, then all subdirectories (recursively) are considered part of the source directories by default, except the build directory and directories that look like version-control information (`.svn`, `.bzr`, `.hg`, `.git`, `_darcs`).
If the option `-r` (for _recursive_) is passed, then all subdirectories (recursively) are considered part of the source directories by default, except the build directory and directories that look like version-control information (`.svn`, `.bzr`, `.hg`, `.git`, `_darcs`) and `_opam`, used for project-local opam switches.

This option is enabled by default _if_ the root directory looks like an OCamlbuild project: either a `myocamlbuild.ml` or a `_tags` file is present.

Expand Down
2 changes: 1 addition & 1 deletion src/main.ml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ let proceed () =
<**/*.cmi>: ocaml, byte, native
<**/*.cmx>: ocaml, native
<**/*.mly>: infer
<**/.svn>|"CVS"|".bzr"|".hg"|".git"|"_darcs"|"node_modules": -traverse
<**/.svn>|"CVS"|".bzr"|".hg"|".git"|"_darcs"|"_opam"|"node_modules": -traverse
|};

List.iter
Expand Down
1 change: 1 addition & 0 deletions src/options.ml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ let log_file_internal = ref "_log"
let my_include_dirs = ref [[Filename.current_dir_name]]
let my_exclude_dirs = ref [
[".svn"; "CVS"; ".bzr"; ".hg"; ".git"; "_darcs";
"_opam";
"node_modules"]
]

Expand Down