Commit Graph

2350 Commits

Author SHA1 Message Date
Rudi Grinberg 5754e7328a Add missing dune-project files to tests
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-20 15:07:35 +02:00
Rudi Grinberg 2b72c80fbc Use correct version for error message
Error.deleted_in would use the current version rather than the deleted version
for the error message

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-20 14:02:58 +02:00
Rudi Grinberg 5683909fc3 Update changelog for 1.0.1
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 23:47:06 +02:00
Rudi Grinberg 5835e5b64c
Merge pull request #1035 from diml/move-pp-files-back
Move back .pp files to the source directory
2018-07-19 23:00:27 +02:00
Rudi Grinberg eb0cb1d4c8
Merge pull request #1033 from diml/i-must-not-segfault
Exceptions are the little-death that brings total obliteration
2018-07-19 22:40:12 +02:00
Jeremie Dimino 213e093b07 Move back .pp files to the source directory
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-19 15:59:29 +01:00
Rudi Grinberg a842fdc2d7
Merge pull request #998 from rgrinberg/workspace-env
Add Ability to set Env through a workspace file
2018-07-19 13:26:26 +02:00
Jeremie Dimino 0ad983c729 You get a quote from Dune if you can make Dune crash
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-19 12:22:18 +01:00
Rudi Grinberg 1f0bee0cf7 Rename base to common
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 13:11:42 +02:00
Rudi Grinberg 14030a8ad5 Remove unused open
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-19 12:14:25 +02:00
Rudi Grinberg 655c10164d Use syntax extension for parsing stanza
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg bac0a35785 Accept corrections
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 78e18716ce Rename Shared_stanaza to Dune_env
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 78786e09d4 Initialize env_node from Super_context.create
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg a82e783f15 re-arrange short match to go to the top
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 4860461ba3 Pun inherit_from field
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg b12517debb Move Env stanza to Shared_stanza module
To break dependency cycles. This shared_stanza module doesn't have any
dependencies on actions.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 4769f9df9f Plumb through env node
workspace -> context -> super context

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 61d7e49e07 Move env stanza parsing to Env.t
This will be necessary to allow this stanza in Workspace

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 20fe7a9d20 Refactor workspace type
Make the opam workspace include the shared fields from a base type

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:34:18 +02:00
Rudi Grinberg 6b29a24d89
Merge pull request #1031 from rgrinberg/action-exec
Action exec & Promotion modules
2018-07-18 14:30:27 +02:00
Rudi Grinberg c7bd8bc556 Move sandboxed back to Action
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg 1b71d57bba Move promotion to own module
It's not really related to actions

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg bf2d842075 Split executable parts of Action into Action_exec
This is required for breaking the dep cycle between the context and the Action module

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 14:27:09 +02:00
Rudi Grinberg 3b9fb8df0a
Merge pull request #1030 from rgrinberg/remove-extra-is-standard
Remove extra is standard check that is already done in Osl.eval
2018-07-18 14:26:36 +02:00
Rudi Grinberg 621c666610 Remove extra is standard check that is already done in Osl.eval
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-18 13:12:50 +02:00
Jeremie Dimino 5dd218c0b8 Switch jbuild.ml to applicative parsing and let%map
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-18 11:02:43 +01:00
Jeremie Dimino 6b0a02bec9 Remove one functor
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-18 10:58:45 +01:00
Jeremie Dimino 881540662a Move all code dealing with scanning directories into its own module
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-18 10:58:45 +01:00
Rudi Grinberg 2690415242 Manual dependency sort in super_context
Code is re-arranged so that evaling the OSL can access the Expander module

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-17 23:10:48 +02:00
Rudi Grinberg e421884bd4 Add signature to Super_context.Env
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-17 23:10:48 +02:00
Jeremie Dimino d94a7fe869 Simplify Build_system.eval_glob
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-17 13:29:49 +01:00
Jeremie Dimino 02ed099693 Make it work during bootstrap
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-17 11:37:22 +01:00
Jeremie Dimino 9734b2e6d0 Make the preprocessor more generic
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-17 11:37:22 +01:00
Jeremie Dimino 62f0e826ce Switch bin/main.ml to the let%map syntax
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-17 11:37:22 +01:00
Jeremie Dimino bad0294db3 Add a textual preprocessor implementing a let%map syntax
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-17 11:37:22 +01:00
Jeremie Dimino c52d0676e8 Fix #1019
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-16 14:04:07 +01:00
Jeremie Dimino b7ae454d7d Add a regression test for #1019
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-16 14:04:07 +01:00
Jeremie Dimino 9f7fa5ec68 Fix a typo
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-16 14:04:07 +01:00
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