Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add data only stanza #1590

Merged
merged 20 commits into from
Nov 29, 2018
Merged

Add data only stanza #1590

merged 20 commits into from
Nov 29, 2018

Conversation

rgrinberg
Copy link
Member

subdirs and ignored_subdirs will now truly ignore directories. data-only can be
used to just ignore the rules

@rgrinberg rgrinberg requested a review from a user November 28, 2018 17:38
@rgrinberg rgrinberg requested a review from emillon as a code owner November 28, 2018 17:38
@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch 4 times, most recently from 85fd0ff to 3c68357 Compare November 28, 2018 19:00
@rgrinberg
Copy link
Member Author

This is now ready for review

@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch from 3c68357 to 55233fe Compare November 28, 2018 19:06
@rgrinberg
Copy link
Member Author

One last thing:

Do we want to maintain the old meaning of ignored_subdirs? I.e. have it add directories as data_only?

src/file_tree.ml Outdated Show resolved Hide resolved
@ghost
Copy link

ghost commented Nov 29, 2018

To make things completely explicit, what about using data_only_subdirs rather than data_only?

@ghost
Copy link

ghost commented Nov 29, 2018

Do we want to maintain the old meaning of ignored_subdirs? I.e. have it add directories as data_only?

Yes, we need to in order to preserve backward compatibility. In fact, let's deprecate ignored_subdirs now, it's meaning was always confusing.

@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch from 25075c5 to 898fca0 Compare November 29, 2018 14:36
src/file_tree.ml Outdated Show resolved Hide resolved
src/sub_dirs.ml Outdated Show resolved Hide resolved
src/sub_dirs.ml Outdated Show resolved Hide resolved
src/dune_lang/dune_lang.ml Outdated Show resolved Hide resolved
@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch 3 times, most recently from 5693b84 to e1204b1 Compare November 29, 2018 17:09
@rgrinberg
Copy link
Member Author

@diml ready for another round of review

@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch from e1204b1 to f677658 Compare November 29, 2018 17:34
src/sub_dirs.ml Outdated Show resolved Hide resolved
@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch from 1bfa037 to fb3f7fa Compare November 29, 2018 18:02
subdirs and ignored_subdirs will now truly ignore directories. data-only can be
used to just ignore the rules

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Because regex does not work in bootstrap

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
The stanza no longer allows for reading rules from ignored dirs

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
It should mean data_only dirs

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
@rgrinberg rgrinberg force-pushed the add-data-only-stanza branch from fb3f7fa to f0b7598 Compare November 29, 2018 18:17
@rgrinberg rgrinberg merged commit b53ef23 into ocaml:master Nov 29, 2018
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Nov 29, 2018
CHANGES:

- Expand variables in `install` stanzas (ocaml/dune#1354, @mseri)

- Add predicate language support for specifying sub directories. This allows the
  use globs, set operations, and special values in specifying the sub
  directories used for the build. For example: `(dirs :standard \ lib*)` will
  use all directories except those that start with `lib`. (ocaml/dune#1517, ocaml/dune#1568,
  @rgrinberg)

- Add `binaries` field to the `(env ..)` stanza. This field sets and overrides
  binaries for rules defined in a directory. (ocaml/dune#1521, @rgrinberg)

- Fix a crash caused by using an extension in a project without
  dune-project file (ocaml/dune#1535, fix ocaml/dune#1529, @diml)

- Allow `%{bin:..}`, `%{exe:..}`, and other static expansions in the `deps`
  field. (ocaml/dune#1155, fix ocaml/dune#1531, @rgrinberg)

- Fix bad interaction between on-demand ppx rewriters and using multiple build
  contexts (ocaml/dune#1545, @diml)

- Fix handling of installed .dune files when the backend is declared via a
  `dune` file (ocaml/dune#1551, fixes ocaml/dune#1549, @diml)

- Add a `--stats` command line option to record resource usage (ocaml/dune#1543, @diml)

- Fix `dune build @doc` deleting `highlight.pack.js` on rebuilds, after the
  first build (ocaml/dune#1557, @aantron).

- Allow targets to be directories, which Dune will treat opaquely
  (ocaml/dune#1547, @jordwalke)

- Support for OCaml 4.08: `List.t` is now provided by OCaml (ocaml/dune#1561, @ejgallego)

- Exclude the local esy directory (`_esy`) from the list of watched directories
  (ocaml/dune#1578, @andreypopp)

- Fix the output of `dune external-lib-deps` (ocaml/dune#1594, @diml)

- Introduce `data_only_dirs` to replace `ignored_subdirs`. `ignored_subdirs` is
  deprecated since 1.6. (ocaml/dune#1590, @rgrinberg)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant