Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 0.13.0 #284

Merged
merged 6 commits into from
Sep 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ os: linux
env:
- OCAML_VERSION=4.03.0
- OCAML_VERSION=4.04.0
- OCAML_VERSION=4.05.0
- OCAML_VERSION=4.06.0
- OCAML_VERSION=4.07.0
install:
- echo "yes" | sudo add-apt-repository ppa:avsm/ocaml42+opam12
- echo "yes" | sudo add-apt-repository ppa:avsm/ppa
- sudo apt-get update -qq
- sudo apt-get install -qq opam
- export OPAMYES=1
Expand All @@ -23,7 +26,7 @@ script:
- make distclean
- opam pin add -n -k path ocamlbuild .
- opam install -v ocamlbuild
- opam install -v mtime # this tests topkg, with stub libraries
- opam install -v inotify # this tests oasis, with stub libraries
- opam install -v cpuid # this tests the ocb-stubblr plugin
- opam install -v ppx_deriving # this tests the cppo plugin
- opam install -v mtime.1.0.0 # this tests topkg, with stub libraries
- opam install -v inotify.2.3 # this tests oasis, with stub libraries
- opam install -v cpuid.0.1.1 # this tests the ocb-stubblr plugin
- opam install -v shcaml.0.2.1 # this tests the cppo plugin
14 changes: 13 additions & 1 deletion Changes
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ of the usual "- ".
NEXT_RELEASE:
-------------

0.13.0 (8 Sep 2018):
--------------------

OCamlbuild 0.13.0 contains new features (`ppopt(..)` and `ppxopt(...)` flags,
ocamlbuild options) and bugfixes (to pack production, for 4.08+dev support).

- #45, #190: add ppopt(arg) and ppxopt(package,arg) when -use-ocamlfind
(Gabriel Scherer, review by whitequark,
request by Gabriel Scherer, Gabriel Radanne and Pavel Argentov)
Expand All @@ -22,7 +28,7 @@ NEXT_RELEASE:
custom, debug, failsafe, linkall, ccopt(..), cclib(..), rpath(..), ldopt(..)
(Gabriel Scherer, report by Hannes Mehnert, review by whitequark)

- #272: add the "link" tag to "pack" actions
* #272: add the "link" tag to "pack" actions
Instead of a separate category, "pack" is now another form of linking
like "program", "library", "toplevel" and "output_obj". This fixes
the issue that package(...) tags where not passed at pack-production
Expand All @@ -31,6 +37,12 @@ NEXT_RELEASE:
behavior for all the rules we inspected.
(Gabriel Scherer, original issue diagnosis by Jérémie Dimino)

- #278: typo fixes in the manual
(Xinzhe Yang)

- #282: fix compilation with trunk OCaml (4.08+dev)
(Xavier Clerc and Nandor Licker)

0.12.0 (11 Nov 2017):
---------------------

Expand Down
4 changes: 2 additions & 2 deletions manual/manual.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ Feel free to look at the implementation and link:../CONTRIBUTING.adoc[send a pat
* `dontlink(pkgname)`
* `predicate(foo)`
* `syntax(bar)`
* `ppopt(camlp4-option)` (since NEXT_RELEASE)
* `ppxopt(package,option)` (since NEXT_RELEASE)
* `ppopt(camlp4-option)` (since 0.13.0)
* `ppxopt(package,option)` (since 0.13.0)

===== `ocamllex` tags

Expand Down
13 changes: 11 additions & 2 deletions testsuite/internal.ml
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,18 @@ let () = test "StrictSequenceFlag"
~description:"strict_sequence tag"
~tree:[T.f "hello.ml" ~content:"let () = 1; ()";
T.f "_tags" ~content:"true: strict_sequence\n"]
~failing_msg:"File \"hello.ml\", line 1, characters 9-10:
~failing_msg:(if Sys.ocaml_version < "4.07.0" then
"File \"hello.ml\", line 1, characters 9-10:
Error: This expression has type int but an expression was expected of type
unit\nCommand exited with code 2."
unit
Command exited with code 2."
else
"File \"hello.ml\", line 1, characters 9-10:
Error: This expression has type int but an expression was expected of type
unit
because it is in the left-hand side of a sequence
Command exited with code 2."
)
~targets:("hello.byte",[]) ();;

let () = test "StrictFormatsFlag"
Expand Down