Fix #1103

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
ocaml · Aug 6, 2018 · f74a064 · f74a064
1 parent 99e0686
commit f74a064
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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