search for: 1b51376be

--- builder/Makefile.am | 6 +++++- builder/languages.ml | 13 ++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index e64c8991f..1b51376be 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -126,6 +126,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/ocaml \ -I $(top_builddir)/common/mlstdutils \ -I $(top_builddir)/common/mlutils \ + -I $(top_builddir)/common/mlpcre \ -I $(top_builddir)/mllib \ -I $(top_builddir)/customi...

...ore index 0e7a649f8..4d738d10f 100644 --- a/.gitignore +++ b/.gitignore @@ -380,6 +380,7 @@ Makefile.in /mllib/getopt_tests /mllib/JSON_tests /mllib/oUnit-* +/ocaml-dep.sh /ocaml/bindtests.bc /ocaml/bindtests.opt /ocaml/bindtests.ml diff --git a/builder/Makefile.am b/builder/Makefile.am index 1b51376be..e1c7bd016 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -310,23 +310,14 @@ CLEANFILES += \ console-*.img \ console-*.out -# Dependencies. -depend: .depend - -.depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) - rm -f $@ $@-t - $(OCAMLFIND) ocamldep -I ../...

We'd like to use PCRE instead of the awful Str module. However I don't necessarily want to pull in the extra dependency of ocaml-pcre, and in any case ocaml-pcre is rather difficult to use. This introduces very simplified and lightweight bindings for PCRE. They work rather like Str in that there is some global state (actually thread-local in this implementation) between the matching and

v2: - Change the OCaml code in the daemon to use PCRE instead of Str. - Call pcre_compile2 so we can capture the error code on failure. - Extend the test suite. - Some other cleanups, but very minor. Rich.