[sledge] Bump version of dune language used, and format dune files

Reviewed By: jvillard

Differential Revision: D20322870

fbshipit-source-id: 0483df098

sledge/Makefile

@@ -91,7 +91,7 @@ clean:
 
 .PHONY: fmt
 fmt:
-	dune build $(FMTS) --auto-promote
+	dune build @fmt --auto-promote
 	ocamlformat -i $(DUNEINS)
 	clang-format -i model/llair_intrinsics.h model/cxxabi.cpp
 	${MAKE} -C test fmt

sledge/dune

@@ -3,12 +3,13 @@
 ; This source code is licensed under the MIT license found in the
 ; LICENSE file in the root directory of this source tree.
 
-(ignored_subdirs (llvm test))
+(dirs :standard \ llvm test)
 
 (rule
  (targets sledge-help.txt)
  (deps bin/sledge.ml bin/sledge_buck.ml tools/gen_help.sh bin/sledge.exe)
  (action
-  (with-stdout-to sledge-help.txt
+  (with-stdout-to
+   sledge-help.txt
    (run tools/gen_help.sh)))
  (mode promote-until-clean))

sledge/dune-project

@@ -1,2 +1 @@
-(lang dune 1.1)
-(using fmt 1.1)
+(lang dune 2.0)

sledge/dune-workspace

@@ -1,4 +1,9 @@
-(lang dune 1.0)
+(lang dune 2.0)
+
+; Copyright (c) Facebook, Inc. and its affiliates.
+;
+; This source code is licensed under the MIT license found in the
+; LICENSE file in the root directory of this source tree.
 
 (context (opam (switch sledge) (name dbg) (merlin)))
 (context (opam (switch sledge) (name dbg-opt)))

sledge/model/dune

@@ -6,17 +6,20 @@
 (rule
  (targets cxxabi.bc)
  (deps cxxabi.cpp Makefile llair_intrinsics.h)
- (action (run make ROOT=../../.. cxxabi.bc)))
+ (action
+  (run make ROOT=../../.. cxxabi.bc)))
 
 (rule
  (targets lib_fuzzer_main.bc)
  (deps lib_fuzzer_main.c Makefile)
- (action (run make ROOT=../../.. lib_fuzzer_main.bc)))
+ (action
+  (run make ROOT=../../.. lib_fuzzer_main.bc)))
 
 (rule
  (targets model.ml)
  (deps cxxabi.bc lib_fuzzer_main.bc)
- (action (run ocaml-crunch -m plain -e bc -o model.ml .)))
+ (action
+  (run ocaml-crunch -m plain -e bc -o model.ml .)))
 
 (library
  (name model)

sledge/ppx_trace.opam

@@ -10,7 +10,7 @@ build: [
 ]
 depends: [
   "ocaml"
-  "dune" {>= "1.11.3" build}
+  "dune" {>= "2.0.0"}
   "ppxlib"
 ]
 synopsis: "Conditionally compiled debug tracing"

sledge/sledge.opam

@@ -17,7 +17,7 @@ depends: [
   "crunch" {build}
   "ctypes"
   "ctypes-foreign"
-  "dune" {>= "1.11.3" build}
+  "dune" {>= "2.0" build}
   "dune-build-info"
   "llvm" {= "8.0.0"}
   "ppx_compare"