commit
b616c7e56d
|
@ -1,3 +1,9 @@
|
||||||
|
next
|
||||||
|
----
|
||||||
|
|
||||||
|
- Fix `$ jbuilder --dev` (#1104, fixes #1103, @rgrinberg)
|
||||||
|
|
||||||
|
|
||||||
1.1.0 (06/08/2018)
|
1.1.0 (06/08/2018)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
|
|
@ -399,9 +399,10 @@ let common =
|
||||||
& info ["dev"] ~docs
|
& info ["dev"] ~docs
|
||||||
~doc:{|Same as $(b,--profile dev)|})
|
~doc:{|Same as $(b,--profile dev)|})
|
||||||
in
|
in
|
||||||
match dev with
|
match dev, Which_program.t with
|
||||||
| false -> `Ok false
|
| false, (Dune | Jbuilder) -> `Ok false
|
||||||
| true ->
|
| true, Jbuilder -> `Ok true
|
||||||
|
| true, Dune ->
|
||||||
`Error
|
`Error
|
||||||
(true, "--dev is no longer accepted as it is now the default.")
|
(true, "--dev is no longer accepted as it is now the default.")
|
||||||
and profile =
|
and profile =
|
||||||
|
|
|
@ -95,6 +95,14 @@
|
||||||
test-cases/depend-on-the-universe
|
test-cases/depend-on-the-universe
|
||||||
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
|
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
|
||||||
|
|
||||||
|
(alias
|
||||||
|
(name dev-flag-1103)
|
||||||
|
(deps (package dune) (source_tree test-cases/dev-flag-1103))
|
||||||
|
(action
|
||||||
|
(chdir
|
||||||
|
test-cases/dev-flag-1103
|
||||||
|
(progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected)))))
|
||||||
|
|
||||||
(alias
|
(alias
|
||||||
(name dune-jbuild-var-case)
|
(name dune-jbuild-var-case)
|
||||||
(deps (package dune) (source_tree test-cases/dune-jbuild-var-case))
|
(deps (package dune) (source_tree test-cases/dune-jbuild-var-case))
|
||||||
|
@ -755,6 +763,7 @@
|
||||||
(alias custom-build-dir)
|
(alias custom-build-dir)
|
||||||
(alias dep-vars)
|
(alias dep-vars)
|
||||||
(alias depend-on-the-universe)
|
(alias depend-on-the-universe)
|
||||||
|
(alias dev-flag-1103)
|
||||||
(alias dune-jbuild-var-case)
|
(alias dune-jbuild-var-case)
|
||||||
(alias dune-ppx-driver-system)
|
(alias dune-ppx-driver-system)
|
||||||
(alias dune-project-edition)
|
(alias dune-project-edition)
|
||||||
|
@ -848,6 +857,7 @@
|
||||||
(alias custom-build-dir)
|
(alias custom-build-dir)
|
||||||
(alias dep-vars)
|
(alias dep-vars)
|
||||||
(alias depend-on-the-universe)
|
(alias depend-on-the-universe)
|
||||||
|
(alias dev-flag-1103)
|
||||||
(alias dune-jbuild-var-case)
|
(alias dune-jbuild-var-case)
|
||||||
(alias dune-ppx-driver-system)
|
(alias dune-ppx-driver-system)
|
||||||
(alias dune-project-edition)
|
(alias dune-project-edition)
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
jbuilder --dev flag is accepted
|
||||||
|
|
||||||
|
$ jbuilder build --dev
|
||||||
|
|
||||||
|
dune --dev flag is rejected
|
||||||
|
|
||||||
|
$ dune build --dev
|
||||||
|
dune: --dev is no longer accepted as it is now the default.
|
||||||
|
Usage: dune build [OPTION]... [TARGET]...
|
||||||
|
Try `dune build --help' or `dune --help' for more information.
|
||||||
|
[1]
|
Loading…
Reference in New Issue