Commit 6db75b3d authored by gerd's avatar gerd

Porting pxp-pp to O'Caml 3.10


git-svn-id: https://godirepo.camlcity.org/svn/lib-pxp/trunk@724 dbe99aee-44db-0310-b2b3-d33182c8eb97
parent 7c99130f
......@@ -131,6 +131,28 @@ else
exit 1
fi
######################################################################
# Check camlp4 version
printf "%s" "Checking for camlp4... "
if camlp4; then
if camlp4 -loaded-modules >/dev/null 2>/dev/null; then
echo "3.10 style"
camlp4_style="310"
camlp4_opts="-package camlp4 -syntax camlp4o -ppopt pa_extend.cmo -ppopt q_MLast.cmo"
else
echo "3.09 style"
camlp4_style="309"
camlp4_opts="-package camlp4 -syntax camlp4o -ppopt pa_extend.cmo -ppopt q_MLast.cmo -ppopt -loc -ppopt loc"
fi
else
echo "not found"
echo "Make sure the camlp4 command is in your PATH"
exit 1
fi
######################################################################
# Check ocamllex.opt
......@@ -416,6 +438,8 @@ EXEC_SUFFIX = $exec_suffix
LEXBUF_307 = $lexbuf_307
LEX_OPT = $lex_opt
CAMLP4_LOC = $camlp4_loc
CAMLP4_STYLE = $camlp4_style
CAMLP4_OPTS = $camlp4_opts
_EOF_
######################################################################
......
......@@ -229,7 +229,8 @@ d src/pxp-pp
f src/pxp-pp/Makefile
f src/pxp-pp/META.in
f src/pxp-pp/PPSPEC
f src/pxp-pp/pxp_pp.ml
f src/pxp-pp/pxp_pp.ml.309
f src/pxp-pp/pxp_pp.ml.310
d rtests
f rtests/Makefile
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment