Commit Graph

2088 Commits

Author SHA1 Message Date
Jeremie Dimino bfa73a8cac Fix shadowing of forms
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 11:43:46 +01:00
Jeremie Dimino a738e1bc38 Expose a bug when shadowing a macro
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 11:43:46 +01:00
Rudi Grinberg 1ac0da6347
Merge pull request #950 from rgrinberg/dep-conf-list
Syntax for naming dependencies
2018-07-10 02:47:51 +07:00
Rudi Grinberg 80b3684f9f Make input-file backwards compatible
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 02:36:13 +07:00
Rudi Grinberg 2d59575a31 Fix meaning of ${<} in jbuild files
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:47:18 +07:00
Rudi Grinberg 3866134ca3 Add docs for named deps
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 5e55f3d6c5 Add some missing parens to the manual
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 61c189a6d4 Update CHANGES
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 03f134567d Update documentation for new binding names
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 77800e669e Simplify pattern matching with monads
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Jeremie Dimino eb68a9067d Simplify Dep_conf.t
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 0b2bda03ed Refactor percent forms management
Use a single map for both variables and percent forms

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 46e8614e90 Hide Pform.t
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 4f7e7188d7 Implemenet variable shadowing
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Jeremie Dimino abab989e20 Remove extra module path
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 61a80a6bb3 Simplify a bit expand_step2
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino c10a2c254e Remove a couple of extra begin..end
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 38c0d56ba8 Name the intput file for action preprocessors
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino fa0ab5b4a4 Add a test with (preprocess (action ...))
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 015b317f43 Introduce a bindings variable for actions
We need to know the bindings statically whenever they overwrite existing vars

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 17d4a7c3df Refactor a bit the parsing code for bindings
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 205d12755e Failing test for shadowing bindings
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 65e1aa0043 Rename Jbuild.Named to Jbuild.Bindings
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg bfc1b9fd25 Change binding representation to use a list
This preserves the order of things

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 0b1abc68bd Improve error message for %{<}
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino df15d30845 Completely get rid of first-dep
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino 04f62ecc03 Get rid of uses of %{first-dep}
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Jeremie Dimino fd27e371bc Tweak parsing of bindings
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 8fa41edcff Parse bindings in the new syntax
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 2b7a7fcdff Expand named variables in actions
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 1cc0198d9c Make the tests stanza use named deps
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 7fbe0bc172 Formatting tweaks
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg f121a1546e Generalize named bindings to Jbuild.Named.t
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg b9be63f4b7 small simplification
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg aab701d4a1 Add error checking for duplicate bindings
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 93b0c618d1 Add syntax for binding dependencies to names
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Rudi Grinberg 4be37dd140 Add a list constructor to Dep_conf.t
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2018-07-10 01:32:26 +07:00
Jérémie Dimino e9027b4b11
Improve error message when too many parentheses are used (#983)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 14:32:20 +01:00
Etienne Millon 126c8ba201
Merge pull request #980 from ocaml/rename-to-dune-readme
Rename to dune in README.md
2018-07-09 14:31:53 +02:00
Etienne Millon 47b4b07c15 Update jbuilder/dune relation
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-07-09 13:33:12 +02:00
Etienne Millon bdd579c985 Rename to dune in README.md
Signed-off-by: Etienne Millon <etienne@cryptosense.com>
2018-07-09 13:33:12 +02:00
Jeremie Dimino 7c345b677f Forbid Path.append _ (In_build_dir _)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 12:31:39 +01:00
Jeremie Dimino 0ed758ef8a Fix sandboxing when the build directory is absolute
Fix #979

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 12:31:39 +01:00
Jeremie Dimino f46de28e8d Simplify the code with Option.value
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 10:20:04 +01:00
Jeremie Dimino e05fcb7631 Do not parse dune-project files in ignored directories
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 10:20:04 +01:00
Jérémie Dimino d393630152
Only warn for duplicated fields in jbuild files (#976)
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
2018-07-09 10:18:04 +01:00
Rudi Grinberg 4880b41657
Merge pull request #972 from rgrinberg/update-CHANGES
Update CHANGES
2018-07-09 16:11:23 +07:00
Rudi Grinberg 7375380913
Merge branch 'master' into update-CHANGES 2018-07-09 16:11:16 +07:00
Rudi Grinberg d55c3b8f14
Merge pull request #975 from rgrinberg/rename-jbuilder-dune
Rename more legacy occurrences
2018-07-09 16:10:49 +07:00
Rudi Grinberg 503ebf8a43
Merge branch 'master' into rename-jbuilder-dune 2018-07-09 16:10:32 +07:00