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
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
0a970aba35
Improve error message for undefined aliases
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:50:44 +01:00
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
79f3506922
Add String_with_vars.text_only
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:36:26 +01:00
b4dd6565b2
Add Ordered_set_lang.Unexpanded.fold_strings
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 21:36:26 +01:00
8a0d01a4d4
Merge pull request #934 from Wilfred/master
...
Fix typos
2018-07-01 22:10:53 +07:00
ca424fb3a8
Fix typo
...
Signed-off-by: Wilfred Hughes <me@wilfred.me.uk>
2018-07-01 15:27:18 +01:00
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
60c97ab365
disable opam workspace blackbox test
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
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
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
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
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
5cbf391a04
Add a test suite for workspaces
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
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
9a9445325d
Update changelog
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
80c2d61416
Factorize construction of default workspace configuration
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
9ffa579dbf
Restore rule about empty dune-workspace file
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
744430b684
Update doc
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
757400a6a6
Fix error message about unsupported versions
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
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
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
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
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
19532a8c3d
Generalizes handling of files starting with (lang LANG VER)
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:46:32 +07:00
6823fb0d43
Restore eof_reached
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:46:32 +07:00
d6c35e01df
Split xxx-workspace file between jbuilder and dune
...
- jbuilder only looks for jbuild-workspace files
- dune only looks for dune-workspace files
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-01 01:45:02 +07:00
e706421893
Add function to parse version header from sexp files
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 01:34:33 +07:00
d7796156fd
Use Sexp.Loc.none rather than reinventing in test
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-01 00:34:45 +07:00
23717d1fd6
Drop findlib:x syntax in dune and display an error ( #887 )
...
Signed-off-by: Nathan Rebours <nathan@cryptosense.com>
2018-06-29 21:35:41 +01:00
7e79e2870d
Make the set language more future proof ( #930 )
...
- forbid list starting by an atom not starting with - or :
- allow to avoid the toplevel parentheses in dune files
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-29 21:11:47 +01:00
e886e948b7
Add a test where an action modify one of its dependency ( #923 )
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-29 12:44:51 +01:00
793a0b7c17
Fix the build on 4.02 by emulating -no-keep-locs ( #927 )
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-29 07:40:02 +01:00
8b6b83b8f5
Merge pull request #922 from rgrinberg/persistent-build-files
...
Use Util.Persistent to reimplemented promoted files store
2018-06-29 11:09:23 +06:30
8185337876
Merge branch 'master' into persistent-build-files
2018-06-29 11:07:22 +06:30
79224ff194
Add name to Vfile_kind functor
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 22:42:55 +06:30
ef5a2144dd
Add magic to to_out_string
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 22:40:00 +06:30
473dd9b440
Change the default build profile to dev during bootstrap
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 12:40:27 +01:00
3177404741
Remove extra module from Vfile_kind functor
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 18:02:50 +06:30
2071ac1072
Implement Vfile_kind in term of Persistent
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 18:01:06 +06:30
aa22671b2f
Remove Make_full from file_kind signature since it's unused
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 17:15:34 +06:30
bc09b8fc81
Change Action.Promotion to use Utils.Persistent
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 17:15:34 +06:30
4738b6df89
Make promoted files a set
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 17:15:34 +06:30
2a80d034fa
Use Util.Persistent to reimplemented promoted files store
...
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-06-28 17:15:34 +06:30
af6f003d13
Refactor ordered_set_lang.ml
...
- use the new s-expression parsing API
- simplify the types and the parsing
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 11:26:42 +01:00
f9f5503e81
Change the signature of Of_peek.peek
...
It is always used the same way: `peek raw`, and sometimes preceded by
a `eos`. Remove the old `peek` and add:
- `peek_exn` which is the same the old `peek raw`
- `peek` which returns `None` if the end of sequence is reached
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 11:26:42 +01:00
2982567639
Make the default build profile be dev
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 11:23:10 +01:00
16d34f4a07
Add Which_program to know whether we are dune or jbuilder
...
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 11:23:10 +01:00
9585c8f79d
Move ocamldep output files to the object directory ( #918 )
...
- this avoid the need for the "already_used" business
- this will make it easier to support multi-dir libraries without copy_files
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-06-28 09:46:20 +01:00
Jeremie Dimino
Rudi Grinberg
Wilfred Hughes
Nathan Rebours