Skip to content

self_build_stubs_archive: do not ignore argument#1395

Merged
nojb merged 4 commits intoocaml:masterfrom
nojb:fix_self_build_stubs_archive_name
Oct 5, 2018
Merged

self_build_stubs_archive: do not ignore argument#1395
nojb merged 4 commits intoocaml:masterfrom
nojb:fix_self_build_stubs_archive_name

Conversation

@nojb
Copy link
Copy Markdown
Collaborator

@nojb nojb commented Oct 4, 2018

Closes #1393

@nojb nojb requested a review from a user October 4, 2018 13:35
@nojb nojb requested review from emillon and rgrinberg as code owners October 4, 2018 13:35
@ghost
Copy link
Copy Markdown

ghost commented Oct 4, 2018

Library.{stubs_archive,dll} need updating as well. BTW, it's probably worth adding a test for this.

@ghost
Copy link
Copy Markdown

ghost commented Oct 4, 2018

Could you either add a test or check manually that it works on a project using self_build_stubs_archive by renaming the stubs? This feature dates from the very first version of jbuilder, so I'm not sure whether these changes are enough or not.

@nojb
Copy link
Copy Markdown
Collaborator Author

nojb commented Oct 4, 2018

I will add a test.

@nojb nojb force-pushed the fix_self_build_stubs_archive_name branch from 8dc3761 to b6d26aa Compare October 4, 2018 18:27
@nojb
Copy link
Copy Markdown
Collaborator Author

nojb commented Oct 4, 2018

Test added.

@nojb nojb force-pushed the fix_self_build_stubs_archive_name branch 2 times, most recently from b6d26aa to de6a7dc Compare October 4, 2018 19:09
nojb added 3 commits October 4, 2018 21:09
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb force-pushed the fix_self_build_stubs_archive_name branch from de6a7dc to 8f449f9 Compare October 4, 2018 19:09
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb nojb force-pushed the fix_self_build_stubs_archive_name branch from 8f449f9 to 0f1d7fb Compare October 4, 2018 19:18
@ghost
Copy link
Copy Markdown

ghost commented Oct 5, 2018

Thanks

Copy link
Copy Markdown
Collaborator

@emillon emillon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Can you add "Closes #1393" in one of the commit messages so that the resolution is linked?

@nojb
Copy link
Copy Markdown
Collaborator Author

nojb commented Oct 5, 2018

Sure, I did that by putting the comment in the PR description.

@nojb nojb merged commit 08abbed into ocaml:master Oct 5, 2018
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Oct 10, 2018
CHANGES:

- Do not fail if the output of `ocamlc -config` doesn't include
  `standard_runtime` (ocaml/dune#1326, @diml)

- Let `Configurator.V1.C_define.import` handle negative integers
  (ocaml/dune#1334, @Chris00)

- Re-execute actions when a target is modified by the user inside
  `_build` (ocaml/dune#1343, fix ocaml/dune#1342, @diml)

- Pass `--set-switch` to opam (ocaml/dune#1341, fix ocaml/dune#1337, @diml)

- Fix bad interaction between multi-directory libraries the `menhir`
  stanza (ocaml/dune#1373, fix ocaml/dune#1372, @diml)

- Integration with automatic formatters (ocaml/dune#1252, fix ocaml/dune#1201, @emillon)

- Better error message when using `(self_build_stubs_archive ...)` and
  `(c_names ...)` or `(cxx_names ...)` simultaneously.
  (ocaml/dune#1375, fix ocaml/dune#1306, @nojb)

- Improve name detection for packages when the prefix isn't an actual package
  (ocaml/dune#1361, fix ocaml/dune#1360, @rgrinberg)

- Support for new menhir rules (ocaml/dune#863, fix ocaml/dune#305, @fpottier, @rgrinberg)

- Do not remove flags when compiling compatibility modules for wrapped mode
  (ocaml/dune#1382, fix ocaml/dune#1364, @rgrinberg)

- Fix reason support when using `staged_pps` (ocaml/dune#1384, @charlesetc)

- Add support for `enabled_if` in `rule`, `menhir`, `ocamllex`,
  `ocamlyacc` (ocaml/dune#1387, @diml)

- Exit gracefully when a signal is received (ocaml/dune#1366, @diml)

- Load all defined libraries recursively into utop (ocaml/dune#1384, fix ocaml/dune#1344,
  @rgrinberg)

- Allow to use libraries `bytes`, `result` and `uchar` without `findlib`
  installed (ocaml/dune#1391, @nojb)

- Take argument to self_build_stubs_archive into account. (ocaml/dune#1395, @nojb)

- Fix bad interaction between `env` customization and vendored
  projects: when a vendored project didn't have its own `env` stanza,
  the `env` stanza from the enclosing project was in effect (ocaml/dune#1408,
  @diml)

- Fix stop early bug when scanning for watermarks (ocaml/dune#1423, @diml)
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.

2 participants