Giant merge, finally done

.gitignore

@@ -41,16 +41,10 @@
 /TEMP_cil-bindistrib
 /_build
 /_log
-/META
 /README
 /index.html
-
-# /bin/
-/bin/scaninfer.bat
-/bin/ccured.bat
-/bin/cilly.bat
-/bin/patcher.bat
-/bin/CilConfig.pm
+/stamp-h
+/META
 
 # /debian/
 /debian/build-stamp
@@ -88,26 +82,35 @@
 # /doc/html/
 /doc/html/*
 
-# /lib/
-/lib/splay
-/lib/*.patch2.i*
-/lib/topformflat
-/lib/topformflat.c
-/lib/getrusage
-/lib/Cilly.pm
+# /lib/perl5/
+/lib/perl5/App/Cilly/CilConfig.pm
+/lib/perl5/App/Cilly.pm
+/lib/perl5/Makefile
+/lib/perl5/Makefile.old
+/lib/perl5/MYMETA.yml
+/lib/perl5/MYMETA.json
+/lib/perl5/blib/*
+/lib/perl5/pm_to_blib
 
-# /obj/
-/obj/x86_*
-/obj/.depend
+# /lib/cil
+/lib/cil
 
-# /obj/.depend/
-/obj/.depend/*.d
-/obj/.depend/*.di
+# /share
+/share/cil/ocamlpath
+
+# /bin/
+/bin/cilly.*
+
+# /_build/
+/_build/*
 
 # /src/
 /src/*.output
 /src/ChangeLog
 /src/machdep-ml.c
+/src/cilversion.ml
+/src/feature_config.ml
+/src/machdep.ml
 
 # /src/frontc/
 /src/frontc/*.output
@@ -138,7 +141,6 @@
 /test/*.stackdump
 /test/*_all.c
 /test/testingcil.c
-/test/testcil.random
 /test/__log*
 /test/testsafec.smlog
 /test/Makefile
@@ -396,8 +398,3 @@
 /test/small2/merge-ar
 /test/small2/libmerge.a
 
-
-# /ocamlutil
-/ocamlutil/perfcount.c
-/ocamlutil/profile.c
-/ocamlutil/Makefile

.merlin

@@ -0,0 +1,12 @@
+S src/
+S src/ext/
+S src/ext/pta/
+S src/frontc/
+S ocamlutil/
+B _build/
+B _build/src/
+B _build/src/ext/
+B _build/src/ext/pta/
+B _build/src/frontc/
+B _build/ocamlutil/
+PKG findlib

.travis-ci.sh

@@ -0,0 +1,30 @@
+OPAM_DEPENDS="ocamlfind hevea"
+
+case "$OCAML_VERSION,$OPAM_VERSION" in
+3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;
+3.12.1,1.1.0) ppa=avsm/ocaml312+opam11 ;;
+4.00.1,1.0.0) ppa=avsm/ocaml40+opam10 ;;
+4.00.1,1.1.0) ppa=avsm/ocaml40+opam11 ;;
+4.01.0,1.0.0) ppa=avsm/ocaml41+opam10 ;;
+4.01.0,1.1.0) ppa=avsm/ocaml41+opam11 ;;
+*) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
+esac
+
+echo "yes" | sudo add-apt-repository ppa:$ppa
+sudo apt-get update -qq
+sudo apt-get install -qq ocaml ocaml-native-compilers camlp4-extra opam
+sudo apt-get install -qq texlive
+export OPAMYES=1
+export OPAMVERBOSE=1
+echo OCaml version
+ocaml -version
+echo OPAM versions
+opam --version
+opam --git-version
+
+opam init
+opam install ${OPAM_DEPENDS}
+eval `opam config env`
+./configure
+make
+make test VERBOSE=1

.travis.yml

@@ -0,0 +1,9 @@
+language: c
+script: bash -ex .travis-ci.sh
+env:
+- OCAML_VERSION=4.01.0 OPAM_VERSION=1.0.0
+- OCAML_VERSION=4.01.0 OPAM_VERSION=1.1.0
+- OCAML_VERSION=4.00.1 OPAM_VERSION=1.0.0
+- OCAML_VERSION=4.00.1 OPAM_VERSION=1.1.0
+- OCAML_VERSION=3.12.1 OPAM_VERSION=1.0.0
+- OCAML_VERSION=3.12.1 OPAM_VERSION=1.1.0