Commit 65e91f3b authored by gerd's avatar gerd

Updated


git-svn-id: https://godirepo.camlcity.org/svn/lib-pxp/trunk@382 dbe99aee-44db-0310-b2b3-d33182c8eb97
parent 1bc7d0b1
......@@ -3,41 +3,30 @@
OBJECTS = to_html.cmo to_text.cmo
XOBJECTS = $(OBJECTS:.cmo=.cmx)
ARCHIVE = readme.cma
XARCHIVE = readme.cmxa
NAME = readme
REQUIRES = str pxp
readme: $(ARCHIVE) main.cmo
readme: $(OBJECTS) main.cmo
ocamlfind ocamlc -o readme -custom -package "$(REQUIRES)" \
-linkpkg $(ARCHIVE) main.cmo
-linkpkg $(OBJECTS) main.cmo
readme.opt: $(XARCHIVE) main.cmx
ocamlfind ocamlopt -o readme.opt -custom -package "$(REQUIRES)" \
-linkpkg $(XARCHIVE) main.cmx
$(ARCHIVE): $(OBJECTS)
$(OCAMLC) -a -o $(ARCHIVE) $(OBJECTS)
$(XARCHIVE): $(XOBJECTS)
$(OCAMLOPT) -a -o $(XARCHIVE) $(XOBJECTS)
-linkpkg $(XOBJECTS) main.cmx
#----------------------------------------------------------------------
# general rules:
OPTIONS =
OCAMLC = ocamlc -g $(OPTIONS) $(ROPTIONS)
OCAMLOPT = ocamlopt -p $(OPTIONS) $(ROPTIONS)
OCAMLDEP = ocamldep $(OPTIONS)
OCAMLC = ocamlfind ocamlc -g -package "$(REQUIRES)"
OCAMLOPT = ocamlfind ocamlopt -package "$(REQUIRES)"
OCAMLDEP = ocamldep
OCAMLFIND = ocamlfind
depend: *.ml *.mli
$(OCAMLDEP) *.ml *.mli >depend
depend.pkg: Makefile
$(OCAMLFIND) use -p ROPTIONS= $(REQUIRES) >depend.pkg
.SUFFIXES: .cmo .cmi .cmx .ml .mli .mll .mly
.SUFFIXES: .cmo .cmi .cmx .ml .mli
.ml.cmx:
$(OCAMLOPT) -c $<
......@@ -48,10 +37,7 @@ depend.pkg: Makefile
.mli.cmi:
$(OCAMLC) -c $<
.mll.ml:
ocamllex $<
*.mli:
include depend
include depend.pkg
all: print sort delcol
print: print.ml
ocamlfind ocamlc -o print -package pxp -linkpkg -custom \
ocamlfind ocamlc -o print -package pxp -linkpkg -custom -g \
-predicates pxp_without_utf8 print.ml
sort: sort.ml
......
......@@ -26,17 +26,14 @@ $(XARCHIVE): $(XOBJECTS)
# general rules:
OPTIONS =
OCAMLC = ocamlc -g $(OPTIONS) $(ROPTIONS)
OCAMLOPT = ocamlopt -p $(OPTIONS) $(ROPTIONS)
OCAMLC = ocamlfind ocamlc -g -package "$(REQUIRES)"
OCAMLOPT = ocamlfind ocamlopt -package "$(REQUIRES)"
OCAMLDEP = ocamldep $(OPTIONS)
OCAMLFIND = ocamlfind
depend: *.ml *.mli
$(OCAMLDEP) *.ml *.mli >depend
depend.pkg: Makefile
$(OCAMLFIND) use -p ROPTIONS= $(REQUIRES) >depend.pkg
.SUFFIXES: .cmo .cmi .cmx .ml .mli .mll .mly
.ml.cmx:
......@@ -54,4 +51,3 @@ depend.pkg: Makefile
*.mli:
include depend
include depend.pkg
......@@ -2,8 +2,8 @@
(Anti) Regression tests
----------------------------------------------------------------------
- To build the tests, "markup" must already be compiled in ..
Do "make" to start the compilation.
- To build the tests, PXP must already be compiled.
Do "make" to start the compilation of the tests.
- To run the tests:
./run
......
......@@ -5,10 +5,10 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
test_canonxml: test_canonxml.ml
ocamlfind ocamlc -g -custom -o test_canonxml -package .,str -linkpkg test_canonxml.ml
ocamlfind ocamlc -g -custom -o test_canonxml -package pxp,str -linkpkg test_canonxml.ml
#----------------------------------------------------------------------
.PHONY: all
......
......@@ -5,18 +5,18 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
all: compile marshal_simple marshal_namespace
compile: compile.ml
ocamlfind ocamlc -g -custom -o compile -package .,str -linkpkg compile.ml
ocamlfind ocamlc -g -custom -o compile -package pxp,str -linkpkg compile.ml
marshal_simple: marshal_simple.ml
ocamlfind ocamlc -g -custom -o marshal_simple -package .,str -linkpkg marshal_simple.ml
ocamlfind ocamlc -g -custom -o marshal_simple -package pxp,str -linkpkg marshal_simple.ml
marshal_namespace: marshal_namespace.ml
ocamlfind ocamlc -g -custom -o marshal_namespace -package .,str -linkpkg marshal_namespace.ml
ocamlfind ocamlc -g -custom -o marshal_namespace -package pxp,str -linkpkg marshal_namespace.ml
#----------------------------------------------------------------------
.PHONY: all
......
......@@ -6,7 +6,7 @@ sample="$1"
echo "Testing $sample:"
./compile -in "$sample" -out "sample.ml" -print -super-root -pis -comments >"out1"
echo "- code written to sample.ml, formatted data to out1"
OCAMLPATH=../.. ocamlfind ocamlc -package . -linkpkg -custom sample.ml -o sample
OCAMLPATH=../../src ocamlfind ocamlc -package pxp -linkpkg -custom sample.ml -o sample
echo "- sample.ml compiled to sample"
./sample >out2
echo "- re-read data written to out2"
......
......@@ -5,18 +5,18 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
all: create_element modify strip
create_element: create_element.ml
ocamlfind ocamlc -labels -g -custom -o create_element -package . -linkpkg create_element.ml
ocamlfind ocamlc -labels -g -custom -o create_element -package pxp -linkpkg create_element.ml
modify: modify.ml
ocamlfind ocamlc -g -custom -o modify -package . -linkpkg modify.ml
ocamlfind ocamlc -g -custom -o modify -package pxp -linkpkg modify.ml
strip: strip.ml
ocamlfind ocamlc -g -custom -o strip -package . -linkpkg strip.ml
ocamlfind ocamlc -g -custom -o strip -package pxp -linkpkg strip.ml
#----------------------------------------------------------------------
.PHONY: all
......
......@@ -4,10 +4,10 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
test_negative: test_negative.ml
ocamlfind ocamlc -g -custom -o test_negative -package .,str -linkpkg test_negative.ml
ocamlfind ocamlc -g -custom -o test_negative -package pxp,str -linkpkg test_negative.ml
#----------------------------------------------------------------------
.PHONY: all
......
......@@ -5,11 +5,11 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
test_reader: test_reader.ml
ocamllex minilex.mll
ocamlfind ocamlc -custom -o test_reader -package .,unix,threads \
ocamlfind ocamlc -custom -o test_reader -package pxp,unix,threads \
-linkpkg -thread \
-g minilex.ml test_reader.ml
......
......@@ -5,16 +5,16 @@
# make distclean: remove any superflous files (recursively)
#----------------------------------------------------------------------
OCAMLPATH=../..
OCAMLPATH=../../src
.PHONY: all
all: test_write test_namespace
test_write: test_write.ml
ocamlfind ocamlc -g -custom -o test_write -package .,str -linkpkg test_write.ml
ocamlfind ocamlc -g -custom -o test_write -package pxp,str -linkpkg test_write.ml
test_namespace: test_namespace.ml
ocamlfind ocamlc -g -custom -o test_namespace -package .,str -linkpkg test_namespace.ml -predicates pxp_without_utf8
ocamlfind ocamlc -g -custom -o test_namespace -package pxp,str -linkpkg test_namespace.ml -predicates pxp_without_utf8
#----------------------------------------------------------------------
......
(* $Id: test_namespace.ml,v 1.1 2001/05/17 22:30:47 gerd Exp $
(* $Id: test_namespace.ml,v 1.2 2001/06/14 23:34:07 gerd Exp $
* ----------------------------------------------------------------------
*
*)
......@@ -38,7 +38,7 @@ let parse_and_write in_filename =
warner = new warner;
enable_pinstr_nodes = true;
enable_super_root_node = true;
enable_namespace_processing = Some(new namespace_manager);
enable_namespace_processing = Some(new Pxp_dtd.namespace_manager);
encoding = `Enc_iso88591;
}
in
......@@ -86,6 +86,9 @@ if !error_happened then exit(1);;
* History:
*
* $Log: test_namespace.ml,v $
* Revision 1.2 2001/06/14 23:34:07 gerd
* Updated
*
* Revision 1.1 2001/05/17 22:30:47 gerd
* Initial revision.
*
......
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