Commit 2457325d authored by Pietro Abate's avatar Pietro Abate

[r2005-03-21 12:56:10 by afrisch] Misc bugfixes

Original author: afrisch
Date: 2005-03-21 12:56:10+00:00
parent ff0a7636
0.3.1
- Bug fix release
* configure must not require pxp
* improt XML Schema with expat
* inclusion of external entities with expat
* META.in, cduce_mktop missing in package
0.3.0
- Language:
......
......@@ -45,7 +45,7 @@ Additional optional packages:
pxp >= 1.1.95
http://www.ocaml-programming.de/packages/documentation/pxp/index_dev.html
ocaml-expat >= 0.1.0
ocaml-expat >= 0.9.1
http://home.wanadoo.nl/maas/ocaml/
......
......@@ -46,7 +46,8 @@ debug:
# Packaging
DISTRIB = $(DIRS) cduce.spec tools depend INSTALL INSTALL.WIN32 CHANGES \
LICENSE README AUTHORS Makefile.conf.template configure configure.ml doc
LICENSE README AUTHORS Makefile.conf.template configure configure.ml doc \
META.in cduce_mktop
DISTRIB_DOC = doc.xml memento.xml tutorial.xml manual.xml tutorial manual \
xhtml.cd xhtml-categ.cd xhtml-strict.cd site.cd
......
......@@ -296,6 +296,7 @@ clean:
rm -f web/*.cdo
rm -f configure.log
rm -rf web/doc
rm -f META
distclean: clean
rm -f Makefile.conf
......
......@@ -244,15 +244,15 @@ let pxp,expat =
false,false
| c,n -> c,n
let required_packages =
["camlp4"; "num";
"pcre"; "ulex"; "cgi"; "netstring";
"pxp-engine"; "pxp-lex-iso88591"
]
let required_packages = ["camlp4"; "num"; "pcre"; "ulex"; "cgi"; "netstring"]
let () =
List.iter need_pkg required_packages;
if not pxp_wlex then need_pkg "pxp-lex-utf8";
if pxp then (
need_pkg "pxp-engine";
need_pkg "pxp-iso88591";
if not pxp_wlex then need_pkg "pxp-lex-utf8";
);
print "Creating Makefile.conf...\n";
......
......@@ -21,7 +21,7 @@ let load_from_file p s =
with exn -> close_in ic; raise exn
let rec load_expat se ee txt s =
let p = Expat.parser_create "" in
let p = Expat.parser_create None in
Expat.set_start_element_handler p se;
Expat.set_end_element_handler p ee;
Expat.set_character_data_handler p txt;
......
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