François Bobot
511801c0d7
Merge pull request #337 from Chris00/meta
...
Escape double quotes for META field values
2017-11-24 16:24:09 +01:00
Christophe Troestler
d8a39b66de
Move escape_double_quote to Import.String & refactor
2017-11-24 16:08:34 +01:00
Christophe Troestler
1e280e56d1
Escape double quotes for META field values
...
Fixes https://github.com/janestreet/jbuilder/issues/331
2017-11-23 19:25:45 +01:00
Christophe Troestler
619d64d101
Quote programs in the bootstrap script
...
Fixes https://github.com/janestreet/jbuilder/issues/322
2017-11-15 20:23:01 +00:00
David Allsopp
9e1aeba5aa
Update homebrew before installing aspcud
...
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 14:50:34 +00:00
David Allsopp
5450e53ff5
Use a specific version number for the CI pin
...
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 14:50:34 +00:00
David Allsopp
5a2c5af811
Ensure opam gets updated occasionally
...
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 14:50:34 +00:00
David Allsopp
1ccf71904e
Ensure jbuilder pin refreshed in CI builds
...
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 14:50:34 +00:00
David Allsopp
d486c9c2c6
Update test matrix
...
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 14:50:34 +00:00
David Allsopp
1dff4e5b12
Update AppVeyor to OCaml 4.06.0
...
Fixes #324 .
Signed-off-by: David Allsopp <david.allsopp@metastack.com>
2017-11-15 13:53:38 +00:00
Rudi Grinberg
5103035bef
Pass context when executing actions ( #329 )
2017-11-14 23:36:12 +08:00
Rudi Grinberg
0c2228e7bc
Refactor jbuilder exec path handling ( #327 )
...
There's no need for runcwd as initial_cwd is already defined somewhere. Add
Filename.analyze_program_name function to make the clearer.
2017-11-14 15:19:58 +08:00
Spiros Eliopoulos
7383b0b006
docs: add some docstrings in various places ( #252 )
...
* docs: update some documentation in the Build module
* docs: document what [Scope.resolve] does
* docs: add a toplevel docstring to the Alias module
* docs: document (or not) the bootstrap function
* docs: lightly document the bootstrap module
* fix ignore comment
2017-11-09 20:41:52 +08:00
Rudi Grinberg
ea7fa8541b
Fix off by 1 error in String.drop_prefix ( #319 )
2017-11-09 12:45:53 +08:00
Rudi Grinberg
dd99126d36
Update CHANGELOG for next version
2017-11-07 23:02:31 +08:00
Rudi Grinberg
5fa8f6eb26
Add "S ." to .merlin ( #284 )
2017-11-07 22:16:36 +08:00
Rudi Grinberg
a57c488dd7
Fix jbuilder rule in case of missing binaries ( #292 )
...
Make jbuilder rules work even when binaries are missing
* Proper error messages for missing binaries
* Unify Prog_spec and Maybe_prog
both can simply be unified into a path type that has a hint for the error
* Remove scarcely useful in_the_tree parameter
It's always true except for the C compiler. In which case, there's no harm in
making it true.
* Make Artifacts return Action.Prog
The old return value was simply converted to this anyway. It's simpler to just
return the proper error straight up.
* Remove remains of in_the_tree
2017-11-07 21:42:55 +08:00
Rudi Grinberg
9c8ecc9fbc
Improve jbuilder exec ( #286 )
...
* Improve jbuilder exec
When the path passed contianed to exec contains a '/', it will be interpreted
relative to the path of a build context (default context when absent)
* Update man page of jbuilder exec
* Add String.drop_prefix
* Make jbuilder exec understand relative/absolute paths
jbuilder exec will now interpret absolute paths as relative to the specified
build context. While relative paths will now be intepreted relative to the cwd
appended to the specified build context.
* Fix jbuilder exec /absolute/path
When the path provided to jbuilder exec is absolute, we should ignore the build
context for looking up the binary.
* Fix exec when ran outside of root
Previously, a call like $ jbuilder exec ./xxx --root=p would raise
an exception. Now ./xxx will be intepreterd relative to --root.
* Fix relative paths when jbuilder is ran outside of --root
* Simplify documentation for jbuilder exec
2017-11-07 21:41:09 +08:00
Rudi Grinberg
8718fdac88
Merge pull request #306 from MiloDavis/doc-non-public
...
Build documentation for non-public libraries
2017-11-07 20:54:00 +08:00
Rudi Grinberg
1cf4f81767
Correct change log
...
Regression was on all 32 bit OCaml rather than Windows
2017-11-06 21:36:25 +08:00
Rudi Grinberg
1f0be6f9e3
Update change log for beta 16
2017-11-06 17:40:51 +08:00
Rudi Grinberg
adb5662ee7
Merge pull request #314 from rgrinberg/4.06.0-boilerplate
...
4.06.0 boilerplate
2017-11-06 17:38:20 +08:00
Rudi Grinberg
723dc7669d
Merge pull request #313 from janestreet/arch-sixtyfour-4.06-fix
...
Fix regression introduced by PR303.
2017-11-06 17:12:57 +08:00
Rudi Grinberg
d555591820
Update workspace for 4.06.0 and 4.07.0+trunk
2017-11-06 17:08:25 +08:00
Rudi Grinberg
589b79ae28
Update CI matrix for 4.06.0
2017-11-06 17:07:56 +08:00
xclerc
e28cc8d070
Fix regression introduced by PR303.
2017-11-06 09:30:50 +01:00
Rudi Grinberg
4ec018c4c7
Update CHANGELOG for 1.0+beta15
2017-11-04 22:05:14 +08:00
Rudi Grinberg
5149fdd6b0
Merge pull request #303 from janestreet/arch-sixtyfour-4.06
...
Fix detection of 64-bit architectures for 4.06
2017-11-04 01:43:36 +08:00
Milo Davis
f645f0c030
Build documentation for non-public libraries
2017-11-03 16:12:06 +01:00
Xavier Clerc
70946320fd
Use `=` rather than `String.equal` for better compatibility.
2017-11-03 13:49:47 +00:00
Xavier Clerc
9b04e7e931
Look for architecture size in the output of `ocamlc -config` first.
2017-11-03 13:44:41 +00:00
Xavier Clerc
72a3cb008f
Look for `ARCH_SIXTYFOUR` in both `config.h` and `m.h`.
2017-11-02 12:31:14 +00:00
Rudi Grinberg
0d4c1ede99
Merge pull request #299 from rgrinberg/set-default-goal-make
...
Set default goal explicitly in Makefile
2017-10-30 21:08:57 +08:00
Rudi Grinberg
d45db83387
Set default goal explicitly in Makefile
...
In case new rules are introduced in Makefile.dev
2017-10-29 17:40:48 +08:00
François Bobot
4363fb0b12
Merge pull request #296 from zenhack/doc-exe-clarification
...
Clarify use of the .exe extension in the documentation
2017-10-26 13:17:04 +02:00
Ian Denhardt
b5ba49d9b4
Clarify use of the .exe extension
...
.exe for executables is usually a windows-only convention; this threw me
for a moment and it seems worth calling out that this isn't platform
dependent.
2017-10-25 15:10:32 -04:00
François Bobot
27cbf1de38
Merge pull request #294 from janestreet/revert-290-new-odoc
...
Revert "RFC update odoc rules"
2017-10-24 14:05:19 +02:00
François Bobot
2bd8fe49b4
Revert "RFC update odoc rules"
2017-10-24 13:58:34 +02:00
François Bobot
e88b94b4f5
Merge pull request #290 from janestreet/new-odoc
...
Compelte and update odoc comments
2017-10-24 13:58:10 +02:00
Thomas Refis
765302461d
odoc: handle .mld files
2017-10-24 11:51:28 +01:00
Rudi Grinberg
aaafdf02fe
Merge pull request #287 from rgrinberg/duplicate-public-names
...
Report duplicate names with a good error message
2017-10-22 19:17:11 +08:00
Rudi Grinberg
266af18836
Merge pull request #288 from zploskey/fix_error_message
...
Fix depending spelling and add comma in error message
2017-10-20 15:06:54 +08:00
Zach Ploskey
3c9de3a9d1
Fix depending spelling and add comma in error message
2017-10-19 23:28:14 -07:00
Rudi Grinberg
bfc83d71d7
Report duplicate names with a good error message
...
Indicate which name is duplicated in which jbuild files
2017-10-20 11:08:42 +08:00
Rudi Grinberg
a63276f5b3
Merge pull request #268 from janestreet/new-alias-semantic
...
Sort out recursive/non-recursive aliases
2017-10-19 15:33:23 +08:00
Rudi Grinberg
e23f6fe8bb
Use Alias.of_path over Path operations and Alias.make
2017-10-19 08:35:08 +08:00
Rudi Grinberg
bfb241cce0
add pretty printers to Alias
...
Useful for debugging
2017-10-19 08:31:52 +08:00
Rudi Grinberg
02a4c59654
Remove mention of recursive aliases from error message
...
all aliases are non recursive
2017-10-19 08:17:34 +08:00
Rudi Grinberg
192f6681e0
Fix jsoo cram tests
...
The order of some commands changed. However, the same commands are still being
executed.
2017-10-16 10:38:40 +08:00
Rudi Grinberg
604e599e4e
Merge pull request #278 from rgrinberg/doc-tweaks
...
Document utop command
2017-10-16 08:01:09 +08:00