From 56b4348970c7220d76c95d752793638fff14f452 Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Wed, 23 Aug 2017 15:46:55 -0700 Subject: [PATCH] [jbuild] keep beta11 for now Reviewed By: jberdine Differential Revision: D5689286 fbshipit-source-id: 8fc6473 --- infer/src/jbuild.in | 40 +++++++++++++++++++--------------------- opam.lock | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/infer/src/jbuild.in b/infer/src/jbuild.in index f458ad738..b5e5ff707 100644 --- a/infer/src/jbuild.in +++ b/infer/src/jbuild.in @@ -10,27 +10,25 @@ let ( ^/ ) = Filename.concat let sources = let src_dirs = - (* if you update the list of source directories, do not forget to also update .merlin *) - "." - :: ( if facebook then - (* do not use the symlinks in src/facebook/: jbuilder will not detect that the files have changed if they are hidden behind a symlink *) - "../../facebook/skel/infer/src/facebook" - else "opensource" ) - :: ( ( if clang then ["clang"; ("unit" ^/ "clang")] - else ["clang_stubs"; ("unit" ^/ "clang_stubs")] ) - @ [ (if java then "java" else "java_stubs") - ; "absint" - ; "backend" - ; "base" - ; "bufferoverrun" - ; "checkers" - ; "eradicate" - ; "harness" - ; "integration" - ; "IR" - ; "labs" - ; "quandary" - ; "unit" ] ) + ( if facebook then + (* do not use the symlinks in src/facebook/: jbuilder will not detect that the files have changed if they are hidden behind a symlink *) + "../../facebook/skel/infer/src/facebook" + else "opensource" ) + :: ( ( if clang then ["clang"; ("unit" ^/ "clang")] + else ["clang_stubs"; ("unit" ^/ "clang_stubs")] ) + @ [ (if java then "java" else "java_stubs") + ; "absint" + ; "backend" + ; "base" + ; "bufferoverrun" + ; "checkers" + ; "eradicate" + ; "harness" + ; "integration" + ; "IR" + ; "labs" + ; "quandary" + ; "unit" ] ) in let files = ref [] in let ml_suffixes = [".ml"; ".mli"; ".mll"; ".mly"] in diff --git a/opam.lock b/opam.lock index b56125442..07c7ac886 100644 --- a/opam.lock +++ b/opam.lock @@ -24,7 +24,7 @@ fieldslib = v0.9.0 integers = 0.2.2 jane-street-headers = v0.9.0 javalib = 2.3.3 -jbuilder = 1.0+beta12 +jbuilder = 1.0+beta11 menhir = 20170712 num = 0 ocaml-compiler-libs = v0.9.0