Skip to content

Fixes #3443#3444

Closed
bikallem wants to merge 151 commits intoocaml:masterfrom
bikallem:master
Closed

Fixes #3443#3444
bikallem wants to merge 151 commits intoocaml:masterfrom
bikallem:master

Conversation

@bikallem
Copy link
Copy Markdown
Contributor

@bikallem bikallem commented May 2, 2020

Fixes #3443

Signed-off-by: Bikal Gurung gbikal@gmail.com

thizanne and others added 30 commits April 13, 2020 00:12
Signed-off-by: Thibault Suzanne <thi.suzanne@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
There was some common code between linting and normal preprocessing that
can be factored out

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
There's no need to pass `-ocamlc` manually

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
This module was missing an mli for quite a while. The omission must have
been accidental.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Fix #3399
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Add applicative interface to build
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Simplify flag handling in preprocessing
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Write mli for Action_ast
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
It's not set per context (or super context), but for an entire
subcommand.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Stop passing external lib deps mode
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Better "since" error messages
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
* Move definitions close to their usage
* Do not leak unnecessary names
* Add some comments

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Organize install_rules a little better
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
* Properly error on missing packages in (package ..) definitions
* Move <pkg>-files aliases to the package dir. This makes rule loading
lazier.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
See #3357.

Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Use [Path.readdir_unsorted] which is more type-safe and is
explicit about errors. Also, simplify [is_hex_char].

Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
See #3357.

Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Andrey Mokhov <amokhov@janestreet.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Add Fiber.Result module
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Reproduce include_subdirs + cinaps bug
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Fix small typo in doc
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
greedy and others added 24 commits May 6, 2020 12:07
The second argument of a 'diff?' action is removed from the set of
targets as the action consumes (i.e. deletes) the file.

Signed-off-by: Geoffrey Reedy <geoff@programmer-monk.net>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
The second argument of a 'diff?' action is removed from the set of
targets as the action consumes (i.e. deletes) the file.

Signed-off-by: Geoffrey Reedy <geoff@programmer-monk.net>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
The second argument must be in the build dir, as we cannot produce
targets outside the build dir.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
The second argument must be in the build dir, as we cannot produce
targets outside the build dir.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Co-authored-by: Jérémie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Co-authored-by: Jérémie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
… as we parse --ppx

Signed-off-by: Bikal Gurung <gbikal@gmail.com>
… as we parse --ppx

Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Stephanie You <youstephanie98@gmail.com>
Co-authored-by: Jérémie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Stephanie You <youstephanie98@gmail.com>
Co-authored-by: Jérémie Dimino <jeremie@dimino.org>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
$ `dune rules` stopped working. This commit just adds a test witnessing
this bug.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Path.of_string should be called after the build directory was set.

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Fix #3440
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
Signed-off-by: Bikal Gurung <gbikal@gmail.com>
@bikallem
Copy link
Copy Markdown
Contributor Author

bikallem commented May 6, 2020

@shonfeder I will create a new PR with the required changes since the commit history here has message up due to some git rebase mistakes owing to DCO failures.

@bikallem bikallem closed this May 6, 2020
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jun 6, 2020
…lugin, dune-private-libs and dune-glob (2.6.0)

CHANGES:

- Fix a bug where valid lib names in `dune init exec --libs=lib1,lib2`
  results in an error. (ocaml/dune#3444, fix ocaml/dune#3443, @bikallem)

- Add and `enabled_ if` field to the `install` stanza. Enforce the same variable
  restrictions for `enabled_if` fields in the `executable` and `install` stanzas
  than in the `library` stanza. When using dune lang < 2.6, the usage of
  forbidden variables in executables stanzas with only trigger a warning to
  maintain compatibility. (ocaml/dune#3408 and ocaml/dune#3496, fixes ocaml/dune#3354, @voodoos)

- Insert a constraint one the version of dune when the user explicitly
  specify the dependency on dune in the `dune-project` file (ocaml/dune#3434 ,
  fixes ocaml/dune#3427, @diml)

- Generate correct META files for sub-libraries (of the form `lib.foo`) that
  contain .js runtime files. (ocaml/dune#3445, @hhugo)

- Add a `(no-infer ...)` action that prevents inference of targets and
  dependencies in actions. (ocaml/dune#3456, fixes ocaml/dune#2006, @roddyyaga)

- Correctly infer targets for the `diff?` action. (ocaml/dune#3457, fixes ocaml/dune#2990, @greedy)

- Fix `$ dune print-rules` crashing (ocaml/dune#3459, fixes ocaml/dune#3440, @rgrinberg)

- Simplify js_of_ocaml rules using js_of_ocaml.3.6 (ocaml/dune#3375, @hhugo)

- Add a new `ocaml-merlin` subcommand that can be used by Merlin to get
  configuration directly from dune instead of using `.merlin` files. (ocaml/dune#3395,
  @voodoos)

- Remove experimental variants feature and make default implementations part of
  the language (ocaml/dune#3491, fixes ocaml/dune#3483, @rgrinberg)
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jun 7, 2020
…lugin, dune-private-libs and dune-glob (2.6.0)

CHANGES:

- Fix a bug where valid lib names in `dune init exec --libs=lib1,lib2`
  results in an error. (ocaml/dune#3444, fix ocaml/dune#3443, @bikallem)

- Add and `enabled_ if` field to the `install` stanza. Enforce the same variable
  restrictions for `enabled_if` fields in the `executable` and `install` stanzas
  than in the `library` stanza. When using dune lang < 2.6, the usage of
  forbidden variables in executables stanzas with only trigger a warning to
  maintain compatibility. (ocaml/dune#3408 and ocaml/dune#3496, fixes ocaml/dune#3354, @voodoos)

- Insert a constraint one the version of dune when the user explicitly
  specify the dependency on dune in the `dune-project` file (ocaml/dune#3434 ,
  fixes ocaml/dune#3427, @diml)

- Generate correct META files for sub-libraries (of the form `lib.foo`) that
  contain .js runtime files. (ocaml/dune#3445, @hhugo)

- Add a `(no-infer ...)` action that prevents inference of targets and
  dependencies in actions. (ocaml/dune#3456, fixes ocaml/dune#2006, @roddyyaga)

- Correctly infer targets for the `diff?` action. (ocaml/dune#3457, fixes ocaml/dune#2990, @greedy)

- Fix `$ dune print-rules` crashing (ocaml/dune#3459, fixes ocaml/dune#3440, @rgrinberg)

- Simplify js_of_ocaml rules using js_of_ocaml.3.6 (ocaml/dune#3375, @hhugo)

- Add a new `ocaml-merlin` subcommand that can be used by Merlin to get
  configuration directly from dune instead of using `.merlin` files. (ocaml/dune#3395,
  @voodoos)

- Remove experimental variants feature and make default implementations part of
  the language (ocaml/dune#3491, fixes ocaml/dune#3483, @rgrinberg)
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jun 7, 2020
…lugin, dune-private-libs and dune-glob (2.6.0)

CHANGES:

- Fix a bug where valid lib names in `dune init exec --libs=lib1,lib2`
  results in an error. (ocaml/dune#3444, fix ocaml/dune#3443, @bikallem)

- Add and `enabled_ if` field to the `install` stanza. Enforce the same variable
  restrictions for `enabled_if` fields in the `executable` and `install` stanzas
  than in the `library` stanza. When using dune lang < 2.6, the usage of
  forbidden variables in executables stanzas with only trigger a warning to
  maintain compatibility. (ocaml/dune#3408 and ocaml/dune#3496, fixes ocaml/dune#3354, @voodoos)

- Insert a constraint one the version of dune when the user explicitly
  specify the dependency on dune in the `dune-project` file (ocaml/dune#3434 ,
  fixes ocaml/dune#3427, @diml)

- Generate correct META files for sub-libraries (of the form `lib.foo`) that
  contain .js runtime files. (ocaml/dune#3445, @hhugo)

- Add a `(no-infer ...)` action that prevents inference of targets and
  dependencies in actions. (ocaml/dune#3456, fixes ocaml/dune#2006, @roddyyaga)

- Correctly infer targets for the `diff?` action. (ocaml/dune#3457, fixes ocaml/dune#2990, @greedy)

- Fix `$ dune print-rules` crashing (ocaml/dune#3459, fixes ocaml/dune#3440, @rgrinberg)

- Simplify js_of_ocaml rules using js_of_ocaml.3.6 (ocaml/dune#3375, @hhugo)

- Add a new `ocaml-merlin` subcommand that can be used by Merlin to get
  configuration directly from dune instead of using `.merlin` files. (ocaml/dune#3395,
  @voodoos)

- Remove experimental variants feature and make default implementations part of
  the language (ocaml/dune#3491, fixes ocaml/dune#3483, @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.

dune init exec foo src --lib=lwt.unix fails