Sisyphus repositório
Última atualização: 1 outubro 2023 | SRPMs: 18631 | Visitas: 37046497
en ru br
ALT Linux repositórios
S:2.5-alt1

Group :: Desenvolvimento/ML
RPM: ocaml-xml-light

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs e FR  Repocop 

Patch: ocaml-xml-light-2.2-alt1.1.patch
Download


 META.in  |    3 +++
 Makefile |   23 +++++++++++++----------
 dtd.ml   |    4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/META.in b/META.in
new file mode 100644
index 0000000..f198c6d
--- /dev/null
+++ b/META.in
@@ -0,0 +1,3 @@
+version="@VERSION@"
+archive(byte)="xml-light.cma"
+archive(native)="xml-light.cmxa"
diff --git a/Makefile b/Makefile
index c978890..9e0adba 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,19 @@
 .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly
 
 INSTALLDIR=`ocamlc -where`
-CFLAGS=
-LFLAGS= -a
+XML_LIGHT_OCAML_CFLAGS= $(OCAML_CFLAGS)
+XML_LIGHT_OCAML_LFLAGS= $(OCAML_LFLAGS) -a
 LIBS=
 
 all: xml-light.cma test.exe doc
 
 opt: xml-light.cmxa test_opt.exe
 
-install: all opt
-	cp xml-light.cmxa xml-light.a xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)
+install: all 
+	cp xml-light.cma xml.mli xmlParser.mli dtd.mli xml.cmi xmlParser.cmi dtd.cmi  $(INSTALLDIR)
+
+installopt: opt all 
+	cp xml-light.a xml-light.cmxa xml.cmx dtd.cmx xmlParser.cmx $(INSTALLDIR)
 
 doc:
 	mkdir doc
@@ -25,10 +28,10 @@ test_opt.exe: xml-light.cmxa
 	ocamlopt xml-light.cmxa test.ml -o test_opt.exe
 
 xml-light.cma: xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo 
-	ocamlc -o xml-light.cma $(LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
+	ocamlc -o xml-light.cma $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmo xml_lexer.cmo dtd.cmo xmlParser.cmo xml.cmo
 
 xml-light.cmxa: xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx 
-	ocamlopt -o xml-light.cmxa $(LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
+	ocamlopt -o xml-light.cmxa $(XML_LIGHT_OCAML_LFLAGS) $(LIBS) xml_parser.cmx xml_lexer.cmx dtd.cmx xmlParser.cmx xml.cmx
 
 dtd.cmo: xml.cmi xml_lexer.cmi dtd.cmi
 
@@ -68,17 +71,17 @@ wclean:
 
 # SUFFIXES
 .ml.cmo:
-	ocamlc $(CFLAGS) -c $<
+	ocamlc $(XML_LIGHT_OCAML_CFLAGS) -c $<
 
 .ml.cmx:
-	ocamlopt $(CFLAGS) -c $<
+	ocamlopt $(XML_LIGHT_OCAML_CFLAGS) -c $<
 
 .mli.cmi:
-	ocamlc $(CFLAGS) $<
+	ocamlc $(XML_LIGHT_OCAML_CFLAGS) $<
 
 .mll.ml:
 	ocamllex $<
 
-.mly.ml:
+%.mli %.ml: %.mly
 	ocamlyacc $<
 
diff --git a/dtd.ml b/dtd.ml
index 3eb61d3..187a068 100644
--- a/dtd.ml
+++ b/dtd.ml
@@ -267,7 +267,7 @@ let trace dtd tag =
 exception TmpResult of dtd_result
 
 let prove_child dtd tag = 
-	trace dtd tag;
+	(*trace dtd tag;*)
 	match dtd.current with
 	| DTDEmpty -> raise (Prove_error EmptyExpected)
 	| DTDAny -> ()
@@ -505,4 +505,4 @@ let to_string = function
 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)
 
 ;;
-to_string_ref := to_string
\ No newline at end of file
+to_string_ref := to_string
 
projeto & código: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
mantenedor atual: Michael Shigorin
mantenedor da tradução: Fernando Martini aka fmartini © 2009