Merge pull request #43 from rgrinberg/ezjsonm

Attempt at getting rid of json parsing in favour of jsonm

.travis-ci.sh

@@ -1,4 +1,4 @@
-OPAM_DEPENDS="re ulex uri xmlm dyntype ounit omd"
+OPAM_DEPENDS="re ulex uri xmlm ezjsonm dyntype ounit omd"
 
 case "$OCAML_VERSION,$OPAM_VERSION" in
 3.12.1,1.0.0) ppa=avsm/ocaml312+opam10 ;;

META.in

@@ -3,11 +3,11 @@ description = "Caml on the Web"
 archive(byte) = "cow.cma"
 archive(native) = "cow.cmxa"
 exists_if = "cow.cma"
-requires = "dyntype dyntype.syntax re re.str ulex uri xmlm omd"
+requires = "dyntype dyntype.syntax ezjsonm re re.str ulex uri xmlm omd"
 package "syntax" (
  description = "Syntax extension for COW"
- requires = "camlp4 str dyntype.syntax xmlm"
- archive(syntax, preprocessor) = "xmlm.cma str.cma pa_cow.cma"
+ requires = "camlp4 str dyntype.syntax xmlm ezjsonm"
+ archive(syntax, preprocessor) = "xmlm.cma str.cma pa_cow.cma ezjsonm.cma"
  archive(syntax, toploop) = "pa_cow.cma"
  exists_if = "pa_cow.cma"
 )

_vars

@@ -2,4 +2,4 @@ NAME=cow
 VERSION=0.9.1
 LIB=cow
 SYNTAX="pa_cow"
-DEPS="dyntype.syntax dyntype re ulex uri xmlm omd"
+DEPS="dyntype.syntax dyntype re ulex uri xmlm omd ezjsonm"

cmd

@@ -35,6 +35,7 @@ configure() {
   # specially needed for syntax TODO merge with _vars
   ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' str >> _config/syntax.deps
   ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' xmlm >> _config/syntax.deps
+  ${OCAMLFIND} query -r -predicates byte -format '-I %d %A' ezjsonm >> _config/syntax.deps
   # _config/syntax has flags to build p4 extensions in syntax/
   ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d' camlp4.quotations.o camlp4.lib camlp4.extend > _config/syntax.build
   ${OCAMLFIND} query -r -predicates syntax,preprocessor -format '-I %d' camlp4.quotations.r camlp4.lib camlp4.extend ${SYNTAX_DEPS} > _config/syntax.build.r