matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,026 Commits 50 Branches 27 Tags 8.1 MiB
Commit Graph

2026 Commits

Author SHA1 Message Date
Rudi Grinberg a8bd8ffa44 Rename JBUILDER_GEN to DUNE_GEN 
Technically, we still support JBUILDER_GEN

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-06 15:10:13 +07:00
Rudi Grinberg 4c0594caff
Port over the dune file description page to dune (#953) 2018-07-05 22:09:56 +07:00
Etienne Millon 6694dd2714
Merge pull request #951 from rgrinberg/port-quickstart-dune 
Port quick start to dune syntax
 2018-07-05 11:47:09 +02:00
Rudi Grinberg 11890d2b8d Port quick start to dune syntax 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-05 16:19:51 +07:00
Armaël Guéneau c757dff4e2 README: fix typo 
Signed-off-by: Armaël Guéneau <armael.gueneau@ens-lyon.fr>
 2018-07-05 09:04:50 +01:00
Etienne Millon 1626faf64f
Merge pull request #948 from emillon/remove-path-no-dep 
Remove path-no-dep
 2018-07-04 10:56:08 +02:00
Etienne Millon 35ff6466de Remove path-no-dep syntax 
See #944

Signed-off-by: Etienne Millon <etienne@cryptosense.com>
 2018-07-04 10:39:57 +02:00
Etienne Millon 9ece73dadc
Merge pull request #944 from emillon/rename-path-vars 
Rename path variables in dune files
 2018-07-03 17:39:50 +02:00
Etienne Millon 628914fe28 Rename path to dep in dune files 
See #842

Signed-off-by: Etienne Millon <etienne@cryptosense.com>
 2018-07-03 15:59:52 +02:00
Rudi Grinberg 9a605b96f5
Merge pull request #937 from rgrinberg/subsystem-versioned 
Subsystem versioned
 2018-07-03 18:59:15 +07:00
Rudi Grinberg 63eb0f2312
Merge branch 'master' into subsystem-versioned 2018-07-03 18:59:02 +07:00
Jérémie Dimino e6a5ef9508
Add the lib_root and libexec_root install sections (#947) 
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
 2018-07-03 10:49:18 +01:00
Rudi Grinberg 7a91a2b23b
Merge branch 'master' into subsystem-versioned 2018-07-03 16:49:05 +07:00
Rudi Grinberg e09695e116 Relax versions for subsystems 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 16:36:11 +07:00
Rudi Grinberg e77367eb2a
Merge pull request #945 from rgrinberg/fallback-dune 
Disable fallback in dune files
 2018-07-03 16:24:27 +07:00
Rudi Grinberg 8e09749f12 Add missing words to syntax error message 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 16:12:01 +07:00
Rudi Grinberg 8b5e1a9a13 Add tests for fallback 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 16:12:01 +07:00
Rudi Grinberg aee019577b Change fallback check to use ?check param 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 16:12:01 +07:00
Rudi Grinberg dee6c9aa96 Disable fallback in dune files 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 16:12:01 +07:00
Jérémie Dimino e56fba9a57
Do not use opam-installer to copy files (#941) 
Instead of calling opam-installer, manually parse .install files and copy the files.

Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
 2018-07-03 10:10:09 +01:00
Jeremie Dimino 6589464f21 Rewrite lexing of installed dune files 
Signed-off-by: Jeremie Dimino <jeremie@dimino.org>
 2018-07-03 09:22:57 +01:00
Rudi Grinberg 04ee6b0b2d Set M.syntax when reading subsystems generated by dune 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 044c78281d Use parsing context when parsing name, version, raw triple of sub systems 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 0051aeca29 Do not read .dune files twice 
Reuse the same lexer by pushing back some tokens manually

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 4af1f189f0 Using Syntax.Verison.t to decide how to generate sub system files 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 22cf958b0c Add dune_version field for libraries 
This field is necessary to know how to generate .dune files for a particular
library.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 9005ca8998 Simplify error handling 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
Rudi Grinberg 01163776ad s/Dune/lang/ 
Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
 2018-07-03 01:01:06 +07:00
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