Commit Graph

2411 Commits

Author SHA1 Message Date
Rudi Grinberg b2892437e6
Merge pull request #1018 from rgrinberg/4.07.0
4.07.0
2018-07-16 11:48:39 +02:00
Rudi Grinberg f8a02b9a1d
Merge branch 'master' into 4.07.0 2018-07-16 11:48:28 +02:00
Jeremie Dimino c3008af5cf Fix #1008
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-16 08:58:27 +01:00
Rudi Grinberg 46a06be092 Add 4.07.0 support in travis
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-15 08:57:15 +02:00
Rudi Grinberg 382ef12c58 Update workspace file for 4.07.0
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-15 08:56:13 +02:00
Rudi Grinberg 3c639a9be7
Merge pull request #1011 from rgrinberg/refactor-expander-osl
Refactor var expansion
2018-07-13 16:56:18 +02:00
Rudi Grinberg 2ec21d7b94 Pass extra params to with_expander
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 62e7684f3b Make the types of expanders uniform everywhere
No labels, and consistent parameter order

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 0db9356692 Fix code error in expansion
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Jeremie Dimino b0e39d30f0 Deforest a bit
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 39c1cef128 Allow to expand multiple values in OSL
Variables that expand to multiple values will be interpreted correctly as
OSL elements

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 72bbd06a1d Generalize expansion to be in own module
The result is Super_context.Expander which can be used for expandding OSL as well

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 6c6a5b7866 Move Resolved_forms to own module
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:30:55 +02:00
Rudi Grinberg 266590452d
Merge pull request #1015 from ankhers/update_executable_stanza_documentation
Update documentation for executable stanza format
2018-07-13 15:19:11 +02:00
Rudi Grinberg 66024e72d4
Merge pull request #1014 from diml/refactor-a-bit-gen_rules
Refactor a bit gen rules
2018-07-13 15:18:45 +02:00
Rudi Grinberg d90ca2c343 Little tweaks to Dir_contents
Make the type private and explicitly ignore the mlds field

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-13 15:17:19 +02:00
Jeremie Dimino e7e28b2044 Move stanzas_per_dir to super_context.ml
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-13 15:17:19 +02:00
Jeremie Dimino b6108d7091 Move a few functions from gen_rules.ml to simple_rules.ml
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-13 15:17:19 +02:00
Jeremie Dimino 5974be475a Refactor a bit the functions computing directories contents
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-13 15:17:19 +02:00
Justin Wood 69b8b8e9ba Update documentation for executable stanza format
Signed-off-by: Justin Wood <justin.k.wood@protonmail.com>
2018-07-13 09:07:48 -04:00
Jeremie Dimino bff39c3426 Remove jbuilder files
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 20:44:36 +01:00
Jeremie Dimino 3effc2fbdf Make targets_dir argument of SC.Action.run non-optional
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino c0a6438fcc Fix reason support by keeping the original extension
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino e6e4589c47 Small simplification
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino dd4994495d Update changelog
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino c0f9c32475 Generate all the .pp files in the object directory
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino 4d4eb5919e Change Module.File.name to Module.File.path
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino b8679d2791 Simplify naming of reason ast files
We don't need to preserve the .ml/.mli extension anymore.

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Jeremie Dimino b67f17bc22 Make the read/create cmi behavior more robust
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-12 14:55:38 +01:00
Rudi Grinberg 742fee0e36
Merge pull request #1012 from rgrinberg/fix-travis-script
Extra ppxlib was listed instead of reason
2018-07-12 14:48:02 +02:00
Rudi Grinberg 9010016daa Extra ppxlib was listed instead of reason
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-12 14:46:41 +02:00
Rijnard van Tonder d04e73e0ef remove outdated paragraph about dune-project file
Signed-off-by: Rijnard van Tonder <rvantonder@gmail.com>
2018-07-12 10:48:59 +01:00
Rudi Grinberg 777e097f9a
Merge pull request #1005 from rgrinberg/change-test-ppxlib
Change ppx_driver dep to ppxlib
2018-07-12 00:51:29 +07:00
Rudi Grinberg 8eced62651 Change ppx_driver dep to ppxlib
We should be testing the most recent combination we can

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 19:46:09 +02:00
Rudi Grinberg 7bdfa44c8d
Merge pull request #1006 from rgrinberg/re-enable-reason
Re-enable reason in CI
2018-07-12 00:44:52 +07:00
Rudi Grinberg f5521f7401 Add dune-project to reason tests
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 19:43:24 +02:00
Rudi Grinberg 254b5d6bdd Re-enable reason in CI
Reason's dependency profile is more reasonable now. We can attempt to re-enable it

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 19:43:24 +02:00
Rudi Grinberg 5a31b9304c
Merge pull request #997 from rgrinberg/fix-workspace-lookup
Fix workspace lookup in conjunction with --root
2018-07-11 23:30:45 +07:00
Rudi Grinberg b4b7dde4f5 Add alias just to be sure
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 17:29:45 +02:00
Rudi Grinberg f9c1d56f55 Improve the path custom conv to use original path when restoring args
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:57:29 +02:00
Rudi Grinberg 630c10edaf Update CHANGELOG
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:42:33 +02:00
Rudi Grinberg ab85720a06 Move custom args to Arg submodule
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:41:29 +02:00
Rudi Grinberg 02beadb856 Use path argument for workspace and config file
This path argument will take paths relatively to the initial CWD

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:41:29 +02:00
Rudi Grinberg 93fb319150 Fix the workspace test not to leak absolute paths
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:41:29 +02:00
Rudi Grinberg ab6bb0d5f7 Fix workspace lookup in cojnuction with --root
The workspace is specified to the initial CWD hence we must convert it a path
relative to it

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-11 16:41:29 +02:00
Etienne Millon 083b2618da
Merge pull request #1001 from ocaml/fix-invalid-deps-message-for-exec
Fix "dune external-lib-deps" hint for dune exec
2018-07-11 13:22:58 +02:00
Etienne Millon 654282c676 Fix "dune external-lib-deps" hint for dune exec
Previously, it was not displaying any target.

Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-07-11 13:21:14 +02:00
Rudi Grinberg fb47664ec0
Merge pull request #996 from rgrinberg/remove-ppx-rewriter-test
Remove ppx test that relies on ppx_driver
2018-07-11 17:28:24 +07:00
Rudi Grinberg 6dfe422937
Merge branch 'master' into remove-ppx-rewriter-test 2018-07-11 17:28:13 +07:00
Jeremie Dimino 5655c925fc Fix #995
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-11 08:37:20 +01:00