From f74a064aed444464a4111bcd472f4e3698780862 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 7 Aug 2018 00:36:27 +0300 Subject: [PATCH] Fix #1103 Signed-off-by: Rudi Grinberg --- CHANGES.md | 6 ++++++ bin/main.ml | 7 ++++--- test/blackbox-tests/test-cases/dev-flag-1103/run.t | 4 ---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 3b4bdd39..e4b4238d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +next +---- + +- Fix `$ jbuilder --dev` (#1104, fixes #1103, @rgrinberg) + + 1.1.0 (06/08/2018) ------------------ diff --git a/bin/main.ml b/bin/main.ml index 6f9e6009..d9a8f494 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -399,9 +399,10 @@ let common = & info ["dev"] ~docs ~doc:{|Same as $(b,--profile dev)|}) in - match dev with - | false -> `Ok false - | true -> + match dev, Which_program.t with + | false, (Dune | Jbuilder) -> `Ok false + | true, Jbuilder -> `Ok true + | true, Dune -> `Error (true, "--dev is no longer accepted as it is now the default.") and profile = diff --git a/test/blackbox-tests/test-cases/dev-flag-1103/run.t b/test/blackbox-tests/test-cases/dev-flag-1103/run.t index bcac035f..42eb527e 100644 --- a/test/blackbox-tests/test-cases/dev-flag-1103/run.t +++ b/test/blackbox-tests/test-cases/dev-flag-1103/run.t @@ -1,10 +1,6 @@ jbuilder --dev flag is accepted $ jbuilder 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] dune --dev flag is rejected