Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt at getting rid of json parsing in favour of jsonm #43

Merged
merged 7 commits into from
Jan 29, 2014
Merged

Attempt at getting rid of json parsing in favour of jsonm #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dee51d0
remove json parsing in favour of ezjsonm
rgrinberg Jan 25, 2014
7711943
update build scripts and META
rgrinberg Jan 25, 2014
dcac910
update deps in travis
rgrinberg Jan 25, 2014
c7a5cda
include ezjsonm in json
rgrinberg Jan 25, 2014
09e08cc
mechanical conversions old json -> ezjsonm
rgrinberg Jan 25, 2014
162cea1
put back Runtime_error exception
rgrinberg Jan 25, 2014
8a718ab
trickier int/float stuff
rgrinberg Jan 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ;;
Expand Down
6 changes: 3 additions & 3 deletions META.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
2 changes: 1 addition & 1 deletion _vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading