Add tuareg and core as dependencies

Reviewed By: jvillard, jberdine

Differential Revision: D4066732

fbshipit-source-id: eccb89e

infer/.merlin

@@ -1,6 +1,7 @@
 S src/**
 B _build/infer/**
 PKG atdgen
+PKG core
 PKG extlib
 PKG javalib
 PKG ounit

infer/src/IR/Annot.re

@@ -29,7 +29,9 @@ type t = {
 /** Compare function for annotations. */
 let compare a1 a2 => {
   let n = string_compare a1.class_name a2.class_name;
-  if (n != 0) {
+
+  /** TODO: just a testing, remove before pushing */
+  if (n != Core.Std.ident 0) {
     n
   } else {
     IList.compare string_compare a1.parameters a2.parameters

infer/src/Makefile

@@ -20,9 +20,12 @@ ATDGEN_SUFFIXES = _t.ml _t.mli _j.ml _j.mli
 
 OCAML_FATAL_WARNINGS = +5+6+8+10+11+12+18+19+20+23+26+29+27+32+33+34+35+37+38+39+50
 
+# options for ocamlbuild
+# Notice that use-ocamlfind is used here to avoid a linker bug in ocamlbuild when using -tag thread
 OCAMLBUILD_OPTIONS = \
 					-r \
-										 -use-menhir -menhir 'menhir --explain --strict' \
+					-use-menhir -menhir 'menhir --explain --strict'\
+					-use-ocamlfind \
 					-cflags -g -lflags -g \
 					-cflags -short-paths \
 					-cflags -safe-string \
@@ -31,7 +34,8 @@ OCAMLBUILD_OPTIONS = \
 					-cflags -strict-sequence \
 					-cflags -w,$(OCAML_FATAL_WARNINGS)-4-9-40-41-42-45-48 \
 					-tag-line "<*{clang/clang_ast_*,backend/jsonbug_*,checkers/stacktree_*}>: warn(-27-32-35-39)" \
-                     -pkgs atdgen,extlib,oUnit,str,unix,yojson,zip
+					-tag thread \
+					-pkgs atdgen,core,extlib,oUnit,str,unix,yojson,zip
 
 ifeq ($(ENABLE_OCAML_ANNOT),yes)
 OCAMLBUILD_OPTIONS += -cflags -annot

opam

@@ -27,6 +27,7 @@ remove: [
 ocaml-version: [ >= "4.02.1" ]
 depends: [
   "atdgen" {>="1.6.0"}
+  "core" {>="113.33.03"}
   "conf-autoconf"
   "extlib-compat" {>="1.5.4"}
   "javalib" {>="2.3.2"}

package.json

@@ -12,6 +12,7 @@
   "name": "infer",
   "dependencies": {
     "@opam-alpha/ocamlfind": "*",
+    "@opam-alpha/core": "113.33.3",
     "@opam-alpha/ocaml": "4.2.3",
     "@opam-alpha/sawja": "^ 1.5.2",
     "@opam-alpha/atdgen": "^ 1.10.0",
@@ -19,6 +20,7 @@
     "@opam-alpha/extlib-compat": "1.7.0",
     "@opam-alpha/ounit": "2.0.0",
     "@opam-alpha/ocp-indent": "1.5.3",
+    "reason-ide-toolkit": "^ 1.2.0",
     "reason": "1.4.0-source",
     "dependency-env": "https://github.com/npm-ml/dependency-env.git",
     "substs": "https://github.com/yunxing/substs.git",

scripts/toplevel_init

@@ -1,5 +1,7 @@
 (* load dependencies *)
 #use "topfind";;
+#thread;;
+#require "core";;
 #require "sawja";;
 #require "atdgen";;
 #require "extlib";;