Updated demos/calc-dune for dune 1.4.

demos/calc-dune/Makefile

 .PHONY: all clean test
 
-DUNE       := jbuilder
+DUNE       := dune
 EXECUTABLE := calc.exe
 
 all:

demos/calc-dune/README

-This demo is identical to the "calc" demo,
-but uses dune (a.k.a. jbuilder)
-instead of ocamlbuild.

demos/calc-dune/README.md

+This demo is identical to the `calc` demo
+but uses dune instead of ocamlbuild.

demos/calc-dune/dune

+(ocamllex
+  (modules lexer)
+)
+
+(menhir
+  (modules parser)
+  (flags ("-la" "2"))
+)
+
+(executable
+  (name calc)
+)

demos/calc-dune/dune-project

+(lang dune 1.4)
+(using menhir 2.0)

demos/calc-dune/jbuild

-(jbuild_version 1)
-
-(ocamllex (lexer))
-
-; TODO: missing a simpler form to invoke menhir
-(menhir (
-  (modules (parser))
-  (flags ("-la" "2"))
-))
-
-(executable
-  ((name calc))
-)