Rudi Grinberg
f6fe5d20bb
Generate dune file version correctly
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
9c0daa24de
Don't hard code parsing_context for sub systems
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
ba9335badf
Simplify dump_config with Option.map
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
7b12e12571
Share loc variable
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
bedad1f689
Set version when parsing dune files
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
8390af90e4
Simplify versioning matching
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
a4bc260241
Loc.of_lexbuf
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
c906801c69
Parse dune files in a versioned way.
...
We read the first 3 tokens of a dune file and use it recognize if the file was
generated using jbuilder or dune
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
179d23ee38
Expose the type of tokens and lexers
...
This will be necessary for some manual parsing
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
67edb7f89e
Move make_loc to Loc module and rename it to of_lexbuf
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-03 01:01:06 +07:00
Rudi Grinberg
51c9b207b1
Merge pull request #942 from rgrinberg/update-migration
...
Update table of renamed vars in docs
2018-07-03 00:14:25 +07:00
Rudi Grinberg
b85cc53b43
Merge branch 'master' into update-migration
2018-07-03 00:11:29 +07:00
Rudi Grinberg
741d323109
Merge pull request #943 from rgrinberg/rename-jbuilder-dune-docs
...
s/jbuilder/dune/ in sphinx config
2018-07-02 19:44:36 +07:00
Rudi Grinberg
1385e2046b
s/jbuilder/dune/ in sphinx config
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-02 18:39:23 +07:00
Rudi Grinberg
8ed1b32ed2
Update table of renamed vars in docs
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-02 18:37:13 +07:00
Etienne Millon
9254f30cc0
Merge pull request #931 from emillon/docs-rename-jbuilder-command
...
Rename jbuilder to dune in docs
2018-07-02 10:23:37 +02:00
Etienne Millon
2f5ac86c71
Rename jbuilder to dune in docs
...
This applies to the program name in text as well as CLI commands, but
not to existing jbuilder files.
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-07-02 10:02:01 +02:00
Jérémie Dimino
438fef915f
Forbid #require in dune files in OCaml syntax ( #938 )
...
And add run_and_read_lines to replace old use cases of Unix.open_process_in
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-02 08:17:53 +01:00
Rudi Grinberg
87039cd616
Merge pull request #939 from rgrinberg/rename-build-profile
...
Rename build profile
2018-07-02 14:09:30 +07:00
Rudi Grinberg
f163f6197a
Merge branch 'master' into rename-build-profile
2018-07-02 13:45:00 +07:00
Rudi Grinberg
5f6e0f658f
Update doc/changes regarding %{profile}
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-02 12:55:48 +07:00
Rudi Grinberg
d19e55bd4d
Rename %{build_profile} to %{profile}
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-02 12:52:48 +07:00
Rudi Grinberg
d53179a56e
Make install tests less verbose ( #936 )
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 22:08:13 +01:00
Jeremie Dimino
0c47cab606
Fix cmdliner errors
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:57:40 +01:00
Jeremie Dimino
9029c61539
Update changelog
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:57:17 +01:00
Jeremie Dimino
fc9f3357ab
Allow some part of a Build.t to be lazy
...
This is useful for (alias_rec ...) since at definition site we recurse
through all sub-directories. This is especially relevant now that we
have the default alias which defaults to (alias_rec install).
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:50:44 +01:00
Jeremie Dimino
81bcd0f3e1
Add a "default" alias defined as follow:
...
- if "default" is specified by the user explicitely, use this
definition
- otherwise assume the following definition:
(alias
(name default)
(deps (alias_rec install)))
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:50:44 +01:00
Jeremie Dimino
0a970aba35
Improve error message for undefined aliases
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:50:44 +01:00
Jeremie Dimino
30db63ef71
Support @@alias to build an alias non-recursively
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:50:44 +01:00
Jeremie Dimino
79f3506922
Add String_with_vars.text_only
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:36:26 +01:00
Jeremie Dimino
b4dd6565b2
Add Ordered_set_lang.Unexpanded.fold_strings
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:36:26 +01:00
Rudi Grinberg
8a0d01a4d4
Merge pull request #934 from Wilfred/master
...
Fix typos
2018-07-01 22:10:53 +07:00
Wilfred Hughes
ca424fb3a8
Fix typo
...
Signed-off-by: Wilfred Hughes <me@wilfred.me.uk>
2018-07-01 15:27:18 +01:00
Rudi Grinberg
a877fc00df
Merge pull request #932 from diml/version-other-files
...
Version `dune-workspace` and `~/.config/dune/config` files
2018-07-01 15:25:09 +07:00
Rudi Grinberg
60c97ab365
disable opam workspace blackbox test
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
d229b7811b
Cleanup test by creating dune-project file
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
aa981b3206
Fix error message when workspace file doesn't exist
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
989a1c0058
don't use wildcard match where not necessary
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
2b307bfe99
Use Option.some_if when checking for workspace file
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
5cbf391a04
Add a test suite for workspaces
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Rudi Grinberg
db4aed42d6
Add %{build_profile} variable
...
Added for testing but could come in handy elsewhere
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
9a9445325d
Update changelog
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
80c2d61416
Factorize construction of default workspace configuration
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
9ffa579dbf
Restore rule about empty dune-workspace file
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
744430b684
Update doc
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
757400a6a6
Fix error message about unsupported versions
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
3d65c4e378
Version the user configuration file
...
- dune requires the (lang ...) line
- jbuilder accepts it but fallback to the jbuild syntax if it's not
present
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
cdcc520430
Disable old syntax for opam contexts in dune-workspace files
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
d5ae6dede0
Make dune require a (lang ...) line in dune-workspace files
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
Jeremie Dimino
7c6ecc821f
Reimplement workspace.ml with the new parsing API
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00