Commit Graph

1810 Commits

Author SHA1 Message Date
Rudi Grinberg 065e2bb26f Make Sexp.Of_sexp.t abstract
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-19 11:29:27 +01:00
Rudi Grinberg 548bcad64c
Merge pull request #886 from rgrinberg/atom-check-simple
Simplifying atom checking and add %
2018-06-19 15:48:16 +07:00
Rudi Grinberg 63c1703045 Simplify the dune atom char set
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-19 15:41:41 +07:00
Rudi Grinberg 8432ee42cf Separate atom_char for jbuild and dune files
Dune files have a more strict definition of atoms

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-19 01:14:19 +07:00
Rudi Grinberg ec8860d0be Add more tests with regards to escaping
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-19 01:00:50 +07:00
Rudi Grinberg 19908abf4d Add '%' back to the atom char set
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-19 00:59:48 +07:00
Rudi Grinberg 5dcefb2e5b Forbid '%' from appearing in atoms
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-18 18:31:56 +07:00
Rudi Grinberg bafb710a5b Remove duplication between Atom.is_valid and should_be_atom
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-18 18:31:56 +07:00
Rudi Grinberg 8f57c6d795
Merge pull request #884 from rgrinberg/fix-error-message
Use extension parameter in error message
2018-06-18 18:08:39 +07:00
Rudi Grinberg fc0e603128
Merge branch 'master' into fix-error-message 2018-06-18 18:03:15 +07:00
Rudi Grinberg 5e753d0c3b
Merge pull request #888 from rgrinberg/escaping-tests-sexp
Add tests for % and $ chars in atoms
2018-06-18 17:45:19 +07:00
Rudi Grinberg 29668c2f42
Merge branch 'master' into escaping-tests-sexp 2018-06-18 17:45:05 +07:00
Ryan Slade b53ec85819 Fix typo (#890)
Signed-off-by: Ryan Slade <ryanslade@gmail.com>
2018-06-18 11:40:14 +01:00
Rudi Grinberg a9142840fd Add tests for % and $ chars in atoms
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-17 12:49:08 +07:00
Rudi Grinberg eb148da6ec Use extension parameter in error message
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-15 12:27:02 +07:00
Jérémie Dimino 3c74bf07e8
Use the same monad to parse all list of S-expressions (#882)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-14 08:51:27 +01:00
Etienne Millon d01b6c8ab1
Merge pull request #879 from emillon/link-deps
Add link_deps field
2018-06-13 15:52:34 +02:00
Etienne Millon 96b01c569c Add link_deps field
In some cases, the linking step requires some dependencies. For example,
passing a version script to the linker. The new `(link_deps)` field
uses the dependency DSL already used in other places.

Closes #852

Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-06-13 14:38:47 +02:00
Jeremie Dimino 5d6e919f04 Turn warning about modules being used multiple times into errors
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-13 11:51:41 +01:00
Jeremie Dimino de26077d28 Get rid of compatibility symlinks for Dune directories
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-13 11:51:41 +01:00
Jeremie Dimino 6abe76c4e7 Get rid of link_executables in dune files (unused)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-13 11:51:41 +01:00
Jeremie Dimino e05c81ac56 Get rid of Jbuild.Provides (unused)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-13 11:51:41 +01:00
Jeremie Dimino 86b130560e Store the project directory in Jbuild.Library.t
There is no risk of confusion about the interpretation of the root
field anymore since it has type Path.Local.t.

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-12 12:09:11 +01:00
Jeremie Dimino f24cf5d110 Make Dune_project.t private
To ensure we can't mutate the mutable fields and that the value is
shared, which is important for the profile_file field for instance.

To make sure we don't confuse the root field for a path in the build
directory, change its type to Path.Local.t.

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-12 12:09:11 +01:00
Jeremie Dimino ef77f83cec Add dune-project file to js_of_ocaml test
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-12 12:09:11 +01:00
Jeremie Dimino 250b940c32 Start of support for languages and extensions
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-12 12:09:11 +01:00
Jérémie Dimino 3cf2a0dab1
Add dune-project files to dune tests and remove old jbuild_version stanzas (#875)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-12 09:49:39 +01:00
Jérémie Dimino 8727eb6c3c
Strengthen the lexing of escape sequences (#872)
Things like \a are no longer allowed. Before they would be interpreted
as a literal \a. This will allow to introduce new escape sequences in
the future if needed.

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-11 16:21:31 +01:00
Jérémie Dimino 58a47e4ff8
Set dune language version to 1.0 (#873)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-11 16:17:22 +01:00
Rudi Grinberg b83d1049fc
Merge pull request #871 from rgrinberg/filename-quote-spacing
Add test for behavior of templates and arguments with spaces
2018-06-11 18:38:55 +07:00
Rudi Grinberg d864e8ca6a Add test for behavior of templates and arguments with spaces
(echo "${read:foo bar}") vs. (echo ${read:foo bar}) handles the argument
differently

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-10 21:40:44 +07:00
Rudi Grinberg 0a17697fca
Merge pull request #868 from rgrinberg/missing-changes
Add a couple of entries to the change log
2018-06-07 23:04:15 +07:00
Rudi Grinberg a48bcf3418
Merge branch 'master' into missing-changes 2018-06-07 23:02:22 +07:00
Etienne Millon 28991eb6b0
Merge pull request #831 from emillon/shared-object-package
Improve error message when attempting to install a shared object
2018-06-07 17:05:06 +02:00
Rudi Grinberg a97d2cfe05 Add a couple of entries to the change log
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 21:28:15 +07:00
Etienne Millon 673397a1b9 Display the installable modes
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-06-07 15:40:45 +02:00
Etienne Millon 9c2e4f14e0 Display an error when no installable mode is found
If an executable is only available as a shared object for example,
Dune cannot install it. In that case, it displays an error message.
However, it is still possible to build a private one explicitly.

Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-06-07 15:17:34 +02:00
Rudi Grinberg 79b8caf4d2
Merge pull request #864 from rgrinberg/doc-private
Refactor odoc generation and fix the private doc alias
2018-06-07 20:10:25 +07:00
Rudi Grinberg cbc3464a85
Merge branch 'master' into doc-private 2018-06-07 20:09:41 +07:00
Rudi Grinberg a3981c588d
Merge pull request #867 from rgrinberg/no-private-module-name
Remove module name private type
2018-06-07 18:01:54 +07:00
Rudi Grinberg 29c38c033b
Merge branch 'master' into no-private-module-name 2018-06-07 18:00:47 +07:00
Rudi Grinberg 3a3c659b19
Merge pull request #866 from rgrinberg/menhir-own-section
Give menhir its own section in the docs
2018-06-07 18:00:20 +07:00
Rudi Grinberg 4b0559a926 Update CHANGES
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:58 +07:00
Rudi Grinberg eda3088a49 Move stanzas to toplevel value
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg 724acc8c7c Allow libraries in a package to reference each other in odocs
This allows for circular dependencies for libraries in the same package

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg c842c76036 Rename typ to source
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg 51ec4a0dc6 Update tests
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg da43480dfc Fix html generation for private libs
private-doc should collect html rather than odoc aliases

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg 794b2c696b Remove unused html_alias field
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00
Rudi Grinberg 20d9b509a1 Setup html rules for libraries and not just their parent pacakge
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-07 17:59:43 +07:00