Rebased for ocaml 4.02.3

.gitignore

@@ -202,11 +202,11 @@
 /byterun/.depend
 /byterun/.depend.nt
 /byterun/.DS_Store
-/byterun/jumptbl.h
+/byterun/caml/jumptbl.h
 /byterun/primitives
 /byterun/prims.c
-/byterun/opnames.h
-/byterun/version.h
+/byterun/caml/opnames.h
+/byterun/caml/version.h
 /byterun/ocamlrun
 /byterun/ocamlrun.exe
 /byterun/ocamlrund
@@ -414,6 +414,7 @@
 /ocamldoc/odoc_text_parser.ml
 /ocamldoc/odoc_text_parser.mli
 /ocamldoc/stdlib_man
+/ocamldoc/stdlib_html
 /ocamldoc/*.output
 /ocamldoc/test_stdlib
 /ocamldoc/test_latex
@@ -2160,6 +2161,31 @@
 /testsuite/tests/tool-debugger/find-artifacts/compiler-libs
 /testsuite/tests/tool-debugger/find-artifacts/out
 
+# /testsuite/tests/tool-debugger/no_debug_event/
+/testsuite/tests/tool-debugger/no_debug_event/*.o
+/testsuite/tests/tool-debugger/no_debug_event/*.a
+/testsuite/tests/tool-debugger/no_debug_event/*.so
+/testsuite/tests/tool-debugger/no_debug_event/*.obj
+/testsuite/tests/tool-debugger/no_debug_event/*.lib
+/testsuite/tests/tool-debugger/no_debug_event/*.dll
+/testsuite/tests/tool-debugger/no_debug_event/*.cm[ioxat]
+/testsuite/tests/tool-debugger/no_debug_event/*.cmx[as]
+/testsuite/tests/tool-debugger/no_debug_event/*.cmti
+/testsuite/tests/tool-debugger/no_debug_event/*.annot
+/testsuite/tests/tool-debugger/no_debug_event/*.result
+/testsuite/tests/tool-debugger/no_debug_event/*.byte
+/testsuite/tests/tool-debugger/no_debug_event/*.native
+/testsuite/tests/tool-debugger/no_debug_event/program
+/testsuite/tests/tool-debugger/no_debug_event/*.exe
+/testsuite/tests/tool-debugger/no_debug_event/*.exe.manifest
+/testsuite/tests/tool-debugger/no_debug_event/.depend
+/testsuite/tests/tool-debugger/no_debug_event/.depend.nt
+/testsuite/tests/tool-debugger/no_debug_event/.DS_Store
+/testsuite/tests/tool-debugger/no_debug_event/compiler-libs
+/testsuite/tests/tool-debugger/no_debug_event/out
+/testsuite/tests/tool-debugger/no_debug_event/c
+/testsuite/tests/tool-debugger/no_debug_event/c.exe
+
 # /testsuite/tests/tool-lexyacc/
 /testsuite/tests/tool-lexyacc/*.o
 /testsuite/tests/tool-lexyacc/*.a

.merlin

@@ -0,0 +1,51 @@
+S ./asmcomp
+B ./asmcomp
+
+S ./bytecomp
+B ./bytecomp
+
+S ./driver
+B ./driver
+
+S ./lex
+B ./lex
+
+S ./otherlibs/bigarray
+B ./otherlibs/bigarray
+
+S ./otherlibs/dynlink
+B ./otherlibs/dynlink
+
+S ./otherlibs/graph
+B ./otherlibs/graph
+
+S ./otherlibs/num
+B ./otherlibs/num
+
+S ./otherlibs/str
+B ./otherlibs/str
+
+S ./otherlibs/systhreads
+B ./otherlibs/systhreads
+
+S ./otherlibs/threads
+B ./otherlibs/threads
+
+S ./otherlibs/unix
+B ./otherlibs/unix
+
+S ./parsing
+B ./parsing
+
+S ./stdlib
+B ./stdlib
+
+S ./toplevel
+B ./toplevel
+
+S ./typing
+B ./typing
+
+S ./utils
+B ./utils
+

.travis-ci.sh

@@ -3,13 +3,14 @@ i386)
   ./configure
   make world.opt
   sudo make install
+
   cd testsuite && make all
-  git clone git://github.com/ocaml/camlp4
-  cd camlp4 && ./configure && make && sudo make install
-  git clone git://github.com/ocaml/opam
-  cd opam && ./configure && make lib-ext && make && sudo make install
-  opam init -y -a git://github.com/ocaml/opam-repository
-  opam install -y utop
+
+  git clone git://github.com/ocamllabs/camlp4
+  (cd camlp4                              \
+   && git checkout modular-implicits-4.02 \
+   && ./configure                         \
+   && make)
   ;;
 *)
   echo unknown arch