]> matita.cs.unibo.it Git - helm.git/commitdiff
* .mli added where needed
authorClaudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Thu, 29 Nov 2001 18:07:10 +0000 (18:07 +0000)
committerClaudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Thu, 29 Nov 2001 18:07:10 +0000 (18:07 +0000)
* Install and uninstall implemented
* Makefile improvements

30 files changed:
helm/ocaml/.cvsignore
helm/ocaml/Makefile.common [deleted file]
helm/ocaml/Makefile.common.in [new file with mode: 0644]
helm/ocaml/Makefile.in
helm/ocaml/cic/.depend
helm/ocaml/cic/Makefile
helm/ocaml/cic/cic.ml
helm/ocaml/cic/deannotate.mli [new file with mode: 0644]
helm/ocaml/cic_annotations/.depend
helm/ocaml/cic_annotations/Makefile
helm/ocaml/cic_annotations/cicAnnotation2Xml.ml
helm/ocaml/cic_annotations/cicAnnotation2Xml.mli [new file with mode: 0644]
helm/ocaml/cic_annotations/cicAnnotationHinter.mli [new file with mode: 0644]
helm/ocaml/cic_annotations/cicAnnotationParser.mli [new file with mode: 0644]
helm/ocaml/cic_annotations/cicAnnotationParser2.mli [new file with mode: 0644]
helm/ocaml/cic_annotations/cicXPath.mli [new file with mode: 0644]
helm/ocaml/cic_annotations_cache/Makefile
helm/ocaml/cic_cache/Makefile
helm/ocaml/cic_proof_checking/.depend
helm/ocaml/cic_proof_checking/Makefile
helm/ocaml/configure.in
helm/ocaml/getter/.depend
helm/ocaml/getter/Makefile
helm/ocaml/getter/configuration.mli [new file with mode: 0644]
helm/ocaml/pxp/.depend
helm/ocaml/pxp/Makefile
helm/ocaml/pxp/csc_pxp_reader.mli [new file with mode: 0644]
helm/ocaml/pxp/pxpUriResolver.mli [new file with mode: 0644]
helm/ocaml/urimanager/Makefile
helm/ocaml/xml/Makefile

index d69218dfc45fe40fc3b824a195ecbacafb0f0308..c9325bab1d88119c4bf5d968bd903521a942bf50 100644 (file)
@@ -8,6 +8,7 @@ META.helm-cic_cache
 META.helm-xml
 META.helm-cic_proof_checking
 Makefile
+Makefile.common
 configure
 config.log
 config.cache
diff --git a/helm/ocaml/Makefile.common b/helm/ocaml/Makefile.common
deleted file mode 100644 (file)
index 84a252e..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-# This Makefile must be included by another one defining:
-#  $REQUIRES
-#  $PREDICATES
-#  $DEPOBJS
-#  $OBJECTS
-#  $PACKAGE
-# and put in a directory where there is a .depend file.
-
-BIN_DIR = /usr/local/bin
-OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
-OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
-OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
-OCAMLDEP = ocamldep
-
-ARCHIVE = $(PACKAGE).cma
-ARCHIVE_OPT = $(PACKAGE).cmxa
-
-
-$(ARCHIVE): $(OBJECTS)
-       $(OCAMLC) -a -o $@ $^
-
-$(ARCHIVE_OPT): $(OBJECTS:.cmo=.cmx)
-       $(OCAMLOPT) -a -o $@ $^
-
-all: $(ARCHIVE)
-opt: $(ARCHIVE_OPT)
-
-depend:
-       $(OCAMLDEP) $(DEPOBJS) > .depend
-
-.SUFFIXES: .ml .mli .cmo .cmi .cmx
-.ml.cmo:
-       $(OCAMLC) -c $<
-.mli.cmi:
-       $(OCAMLC) -c $<
-.ml.cmx:
-       $(OCAMLOPT) -c $<
-
-clean:
-       rm -f *.cm[ioax] *.cmxa *.o
-
-install:
-       #cp
-
-uninstall:
-       #rm -f
-
-.PHONY: all opt depend install uninstall clean
-
-include .depend
diff --git a/helm/ocaml/Makefile.common.in b/helm/ocaml/Makefile.common.in
new file mode 100644 (file)
index 0000000..a04d1a6
--- /dev/null
@@ -0,0 +1,56 @@
+# This Makefile must be included by another one defining:
+#  $PACKAGE
+#  $REQUIRES
+#  $PREDICATES
+#  $INTERFACE_FILES
+#  $IMPLEMENTATION_FILES
+#  $EXTRA_OBJECTS_TO_INSTALL
+# and put in a directory where there is a .depend file.
+
+OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
+
+OCAMLOPTIONS = -package "$(REQUIRES)" -predicates "$(PREDICATES)"
+OCAMLC = ocamlfind ocamlc $(OCAMLOPTIONS)
+OCAMLOPT = ocamlfind ocamlopt $(OCAMLOPTIONS)
+OCAMLDEP = ocamldep
+
+ARCHIVE = $(PACKAGE).cma
+ARCHIVE_OPT = $(PACKAGE).cmxa
+OBJECTS_TO_INSTALL = $(ARCHIVE) $(ARCHIVE_OPT) $(ARCHIVE_OPT:%.cmxa=%.a) \
+                     $(INTERFACE_FILES) $(INTERFACE_FILES:%.mli=%.cmi) \
+                     $(EXTRA_OBJECTS_TO_INSTALL)
+
+$(ARCHIVE): $(IMPLEMENTATION_FILES:%.ml=%.cmo)
+       $(OCAMLC) -a -o $@ $^
+
+$(ARCHIVE_OPT): $(IMPLEMENTATION_FILES:%.ml=%.cmx)
+       $(OCAMLOPT) -a -o $@ $^
+
+all: $(ARCHIVE)
+opt: $(ARCHIVE_OPT)
+
+depend:
+       $(OCAMLDEP) $(INTERFACE_FILES) $(IMPLEMENTATION_FILES) > .depend
+
+.SUFFIXES: .ml .mli .cmo .cmi .cmx
+.ml.cmo:
+       $(OCAMLC) -c $<
+.mli.cmi:
+       $(OCAMLC) -c $<
+.ml.cmx:
+       $(OCAMLOPT) -c $<
+
+clean:
+       rm -f *.cm[ioax] *.cmxa *.o *.a
+
+install:
+       mkdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
+       cp $(OBJECTS_TO_INSTALL) $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
+
+uninstall:
+       cd $(OCAMLFIND_DEST_DIR)/$(PACKAGE) && rm -f $(OBJECTS_TO_INSTALL)
+       rmdir $(OCAMLFIND_DEST_DIR)/$(PACKAGE)
+
+.PHONY: all opt depend install uninstall clean
+
+include .depend
index 83b28f78cae475c6cff9495f6348e6ae861e1609..e5d051620f5107a1ac53c76270adf7dae3d47dab 100644 (file)
@@ -2,6 +2,9 @@
 MODULES = xml urimanager getter pxp cic cic_annotations cic_annotations_cache \
           cic_cache cic_proof_checking
 
+OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
+OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
+
 METAS = $(MODULES:%=META.helm-%)
 CWD=`pwd`
 
@@ -14,19 +17,23 @@ clean: $(MODULES:%=%.clean)
        rm -f $(METAS)
 
 dist-clean: clean
-       rm -f Makefile configure config.log config.cache config.status
+       rm -f Makefile Makefile.common configure config.log config.cache config.status
 
 $(MODULES:%=%.all):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) ; make all
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) && make all
 $(MODULES:%=%.opt):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) ; make opt
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) && make opt
 $(MODULES:%=%.depend):
-       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) ; make depend
+       export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) && make depend
 $(MODULES:%=%.install):
-       cd $(@:%.install=%) ; make install
+       cd $(@:%.install=%) && make install
+       export TARGET=$(OCAMLFIND_META_DIR)/$(@:%.install=META.helm-%) ; \
+       cp $(@:%.install=META.helm-%.src) $$TARGET && \
+       echo "directory=\"$(OCAMLFIND_DEST_DIR)/$(@:%.install=%)\"" >> $$TARGET
 $(MODULES:%=%.uninstall):
-       cd $(@:%.uninstall=%) ; make uninstall
+       cd $(@:%.uninstall=%) && make uninstall
+       rm -f $(OCAMLFIND_META_DIR)/$(@:%.uninstall=META.helm-%)
 $(MODULES:%=%.clean):
-       cd $(@:%.clean=%) ; make clean
+       cd $(@:%.clean=%) && make clean
 META.helm-%: META.helm-%.src
-       cp $< $@ ; echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@
+       cp $< $@ && echo "directory=\"$(CWD)/$(@:META.helm-%=%)\"" >> $@
index 99591c9d0d6afc936177473386cfb4d372ea4e76..b5cfa7d59f82c619c965221c020cd8c42fafa2a8 100644 (file)
@@ -1,11 +1,12 @@
-deannotate.cmo: cic.cmo 
-deannotate.cmx: cic.cmx 
+deannotate.cmi: cic.cmo 
 cicParser3.cmi: cic.cmo 
+cicParser2.cmi: cic.cmo cicParser3.cmi 
+cicParser.cmi: cic.cmo 
+deannotate.cmo: cic.cmo deannotate.cmi 
+deannotate.cmx: cic.cmx deannotate.cmi 
 cicParser3.cmo: cic.cmo cicParser3.cmi 
 cicParser3.cmx: cic.cmx cicParser3.cmi 
-cicParser2.cmi: cic.cmo cicParser3.cmi 
 cicParser2.cmo: cic.cmo cicParser3.cmi cicParser2.cmi 
 cicParser2.cmx: cic.cmx cicParser3.cmx cicParser2.cmi 
-cicParser.cmi: cic.cmo 
 cicParser.cmo: cicParser2.cmi cicParser3.cmi cicParser.cmi 
 cicParser.cmx: cicParser2.cmx cicParser3.cmx cicParser.cmi 
index fd810f3f70ab374c47a0144b6ec2a19f631e73aa..8847e49b38abbee4984d6c8a215548cad4127360 100644 (file)
@@ -2,9 +2,8 @@ PACKAGE = cic
 REQUIRES = helm-urimanager helm-pxp
 PREDICATES =
 
-DEPOBJS = cic.ml deannotate.mli deannotate.ml cicParser3.mli cicParser3.ml \
-          cicParser2.mli cicParser2.ml cicParser.mli cicParser.ml
-
-OBJECTS = cic.cmo deannotate.cmo cicParser3.cmo cicParser2.cmo cicParser.cmo
+INTERFACE_FILES = deannotate.mli cicParser3.mli cicParser2.mli cicParser.mli
+IMPLEMENTATION_FILES = cic.ml $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL = cic.ml cic.cmi
 
 include ../Makefile.common
index 8c08b0075dec425113df9f2bacae31a67b12f6c1..5c42f9e76c9efeb0af3dd3c6fbe87bd6e1afc24a 100644 (file)
@@ -28,7 +28,7 @@
 (*                               PROJECT HELM                                 *)
 (*                                                                            *)
 (*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
-(*                                 14/06/2000                                 *)
+(*                                 29/11/2000                                 *)
 (*                                                                            *)
 (* This module defines the internal representation of the objects (variables, *)
 (* blocks of (co)inductive definitions and constants) and the terms of cic    *)
diff --git a/helm/ocaml/cic/deannotate.mli b/helm/ocaml/cic/deannotate.mli
new file mode 100644 (file)
index 0000000..d1bd72c
--- /dev/null
@@ -0,0 +1,39 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(******************************************************************************)
+
+(* Useful only for fix_params *)
+val expect_possible_parameters : bool ref
+
+val deannotate_term : Cic.annterm -> Cic.term
+val deannotate_obj : Cic.annobj -> Cic.obj
index ac3b26ba0df44893f8120a9ca43d70a94e198339..267924e895d0f9db4260e86f1a1b3bf5c481c420 100644 (file)
@@ -1,2 +1,10 @@
-cicAnnotationParser.cmo: cicAnnotationParser2.cmo 
-cicAnnotationParser.cmx: cicAnnotationParser2.cmx 
+cicAnnotation2Xml.cmo: cicAnnotation2Xml.cmi 
+cicAnnotation2Xml.cmx: cicAnnotation2Xml.cmi 
+cicAnnotationHinter.cmo: cicAnnotationHinter.cmi 
+cicAnnotationHinter.cmx: cicAnnotationHinter.cmi 
+cicAnnotationParser2.cmo: cicAnnotationParser2.cmi 
+cicAnnotationParser2.cmx: cicAnnotationParser2.cmi 
+cicAnnotationParser.cmo: cicAnnotationParser2.cmi cicAnnotationParser.cmi 
+cicAnnotationParser.cmx: cicAnnotationParser2.cmx cicAnnotationParser.cmi 
+cicXPath.cmo: cicXPath.cmi 
+cicXPath.cmx: cicXPath.cmi 
index 738a265ecb1dd4ff5350a0e1eabed7ac11bbab3a..1b85d96bc2e81354360a3337a26c4252c10a1f4d 100644 (file)
@@ -2,10 +2,9 @@ PACKAGE = cic_annotations
 REQUIRES = helm-cic helm-xml lablgtk
 PREDICATES =
 
-DEPOBJS = cicAnnotation2Xml.ml cicAnnotationHinter.ml cicAnnotationParser2.ml \
-          cicAnnotationParser.ml cicXPath.ml
-
-OBJECTS = cicAnnotation2Xml.cmo cicAnnotationHinter.cmo \
-          cicAnnotationParser2.cmo cicAnnotationParser.cmo cicXPath.cmo
+INTERFACE_FILES = cicAnnotation2Xml.mli cicAnnotationHinter.mli \
+                  cicAnnotationParser2.mli cicAnnotationParser.mli cicXPath.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
index c5410b0804779f047fc2c9359c173044d74927f3..5a8adfaff77af0fabe38b4307c1e16182ac3b24b 100644 (file)
@@ -25,9 +25,7 @@
 
 (*CSC codice cut & paste da cicPp e xmlcommand *)
 
-exception ImpossiblePossible;;
 exception NotImplemented;;
-exception BinderNotSpecified;;
 
 let dtdname = "http://www.cs.unibo.it/helm/dtd/annotations.dtd";;
 
diff --git a/helm/ocaml/cic_annotations/cicAnnotation2Xml.mli b/helm/ocaml/cic_annotations/cicAnnotation2Xml.mli
new file mode 100644 (file)
index 0000000..ba1b406
--- /dev/null
@@ -0,0 +1,36 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+val pp_annotation : Cic.annobj -> UriManager.uri -> Xml.token Stream.t
diff --git a/helm/ocaml/cic_annotations/cicAnnotationHinter.mli b/helm/ocaml/cic_annotations/cicAnnotationHinter.mli
new file mode 100644 (file)
index 0000000..6846273
--- /dev/null
@@ -0,0 +1,46 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+val create_hints :
+  < annotation : GEdit.text;
+    annotation_hints : < children : < as_widget : 'a Gtk.obj; .. > list;
+                         connect : < clicked : (unit -> unit) -> GtkSignal.id;
+                                     .. >;
+                         misc : < disconnect : GtkSignal.id -> 'b;
+                                  hide : unit -> 'c; show : unit -> 'd; .. >;
+                         .. >
+                       array;
+    .. > ->
+  'e * (string, Cic.anntarget) Hashtbl.t -> string -> unit
diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser.mli b/helm/ocaml/cic_annotations/cicAnnotationParser.mli
new file mode 100644 (file)
index 0000000..473d05f
--- /dev/null
@@ -0,0 +1,36 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+val annotate : string -> (string, Cic.anntarget) Hashtbl.t -> unit
diff --git a/helm/ocaml/cic_annotations/cicAnnotationParser2.mli b/helm/ocaml/cic_annotations/cicAnnotationParser2.mli
new file mode 100644 (file)
index 0000000..80bc0f6
--- /dev/null
@@ -0,0 +1,51 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+exception IllFormedXml of int
+val annotate :
+  (string, Cic.anntarget) Hashtbl.t ->
+  < node_type : Pxp_document.node_type;
+    sub_nodes : < attribute : string -> Pxp_types.att_value;
+                  node_type : Pxp_document.node_type;
+                  sub_nodes : (< attribute : string -> Pxp_types.att_value;
+                                 attribute_names : string list;
+                                 data : string;
+                                 node_type : Pxp_document.node_type;
+                                 sub_nodes : 'a list; .. > as 'a)
+                              list;
+                  .. >
+                list;
+    .. > ->
+  unit
diff --git a/helm/ocaml/cic_annotations/cicXPath.mli b/helm/ocaml/cic_annotations/cicXPath.mli
new file mode 100644 (file)
index 0000000..5ca9a2c
--- /dev/null
@@ -0,0 +1,37 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+val get_annotation :
+  'a * (string, Cic.anntarget) Hashtbl.t -> string -> string option ref
index 88755306207dd084770d4290487a8f62c0468b62..5daa8160b6dfe08792f6fc105b0122adb242eeb4 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = cic_annotations_cache
 REQUIRES = helm-cic_annotations
 PREDICATES =
 
-DEPOBJS = cicCache.mli cicCache.ml
-
-OBJECTS = cicCache.cmo
+INTERFACE_FILES = cicCache.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
index 76cba058e9df893a617b07278e7bf7c192f901e3..342124a7b2c2e83e276d2a17df30a95988b369b1 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = cic_cache
 REQUIRES = helm-cic
 PREDICATES =
 
-DEPOBJS = cicCache.mli cicCache.ml
-
-OBJECTS = cicCache.cmo
+INTERFACE_FILES = cicCache.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
index da66c1502da7dae1c1d487a5337a2a0e79fd8b0d..81126bbdf56b9b6c96afaa14b2d69edadc669ca7 100644 (file)
@@ -1,9 +1,11 @@
-cicPp.cmo: cicEnvironment.cmi cicPp.cmi 
-cicPp.cmx: cicEnvironment.cmx cicPp.cmi 
-cicEnvironment.cmo: cicSubstitution.cmi cicEnvironment.cmi 
-cicEnvironment.cmx: cicSubstitution.cmx cicEnvironment.cmi 
 cicSubstitution.cmo: cicSubstitution.cmi 
 cicSubstitution.cmx: cicSubstitution.cmi 
+cicEnvironment.cmo: cicSubstitution.cmi cicEnvironment.cmi 
+cicEnvironment.cmx: cicSubstitution.cmx cicEnvironment.cmi 
+cicPp.cmo: cicEnvironment.cmi cicPp.cmi 
+cicPp.cmx: cicEnvironment.cmx cicPp.cmi 
+cicMiniReduction.cmo: cicSubstitution.cmi cicMiniReduction.cmi 
+cicMiniReduction.cmx: cicSubstitution.cmx cicMiniReduction.cmi 
 cicReduction.cmo: cicEnvironment.cmi cicPp.cmi cicSubstitution.cmi \
     cicReduction.cmi 
 cicReduction.cmx: cicEnvironment.cmx cicPp.cmx cicSubstitution.cmx \
@@ -14,5 +16,3 @@ cicTypeChecker.cmx: cicEnvironment.cmx cicPp.cmx cicReduction.cmx \
     cicSubstitution.cmx cicTypeChecker.cmi 
 cicCooking.cmo: cicEnvironment.cmi cicCooking.cmi 
 cicCooking.cmx: cicEnvironment.cmx cicCooking.cmi 
-cicMiniReduction.cmo: cicSubstitution.cmi cicMiniReduction.cmi 
-cicMiniReduction.cmx: cicSubstitution.cmx cicMiniReduction.cmi 
index 97bd462b5e8deac388c3180b7af3d922602c5aa2..ad31350c2dab9b629f991cbccbf5d2e0e30a1808 100644 (file)
@@ -2,13 +2,15 @@ PACKAGE = cic_proof_checking
 REQUIRES = helm-cic
 PREDICATES =
 
-DEPOBJS = cicPp.mli cicPp.ml cicEnvironment.mli cicEnvironment.ml \
-          cicSubstitution.mli cicSubstitution.ml cicReduction.mli \
-          cicReduction.ml cicTypeChecker.mli cicTypeChecker.ml \
-          cicCooking.mli cicCooking.ml cicMinireduction.mli cicMiniReduction.ml
-
-OBJECTS = cicSubstitution.cmo cicEnvironment.cmo cicPp.cmo \
-          cicMiniReduction.cmo cicReduction.cmo cicTypeChecker.cmo \
-          cicCooking.cmo
+INTERFACE_FILES = cicSubstitution.mli cicEnvironment.mli cicPp.mli \
+                  cicMiniReduction.mli cicReduction.mli cicTypeChecker.mli \
+                  cicCooking.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+
+# Metadata tools only need zeta-reduction
+EXTRA_OBJECTS_TO_INSTALL = \
+            cicSubstitution.cmo cicSubstitution.cmx cicSubstitution.o \
+            cicMiniReduction.cmo cicMiniReduction.cmx cicMiniReduction.o
+
 
 include ../Makefile.common
index 715a9d105109d2796fc55e58445a1ac995413e99..d586e335c0030d2647ebfc2d05c7774493c57f8f 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT(Makefile.common)
+AC_INIT(Makefile.in)
 
 AC_CHECK_PROG(HAVE_OCAMLC, ocamlc, yes, no)
 if test $HAVE_OCAMLC = "no"; then
@@ -10,6 +10,18 @@ if test $HAVE_OCAMLFIND = "no"; then
   AC_MSG_ERROR(could not find ocamlfind in PATH, please make sure findlib is installed)
 fi
 
+AC_MSG_CHECKING("where to install the library")
+OCAMLFIND_DEST_DIR="/public/sacerdot/prova"
+AC_MSG_RESULT($OCAMLFIND_DEST_DIR)
+
+AC_MSG_CHECKING("where to install the META files")
+OCAMLFIND_META_DIR="/public/sacerdot/prova/META"
+AC_MSG_RESULT($OCAMLFIND_META_DIR)
+
+AC_SUBST(OCAMLFIND_DEST_DIR)
+AC_SUBST(OCAMLFIND_META_DIR)
+
 AC_OUTPUT([
   Makefile
+  Makefile.common
 ])
index 1b3156776493d5a3e9c16d98964da292124f593f..2013e9b3e1b07b789ed8fddfa5a9c05990d2b350 100644 (file)
@@ -1,4 +1,6 @@
-clientHTTP.cmo: configuration.cmo clientHTTP.cmi 
+configuration.cmo: configuration.cmi 
+configuration.cmx: configuration.cmi 
+clientHTTP.cmo: configuration.cmi clientHTTP.cmi 
 clientHTTP.cmx: configuration.cmx clientHTTP.cmi 
-getter.cmo: clientHTTP.cmi configuration.cmo getter.cmi 
+getter.cmo: clientHTTP.cmi configuration.cmi getter.cmi 
 getter.cmx: clientHTTP.cmx configuration.cmx getter.cmi 
index a3b941b0f7d0eab9a58d45f5df68dc1aae651c3e..32812a747bdf55fbae37aa58180df4e9095638d3 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = getter
 REQUIRES = pxp netclient helm-urimanager
 PREDICATES =
 
-DEPOBJS = clientHTTP.mli clientHTTP.ml getter.mli getter.ml configuration.ml
-
-OBJECTS = configuration.cmo clientHTTP.cmo getter.cmo
+INTERFACE_FILES = configuration.mli clientHTTP.mli getter.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
diff --git a/helm/ocaml/getter/configuration.mli b/helm/ocaml/getter/configuration.mli
new file mode 100644 (file)
index 0000000..4d0bfbc
--- /dev/null
@@ -0,0 +1,48 @@
+(* Copyright (C) 2000, HELM Team.
+ * 
+ * This file is part of HELM, an Hypertextual, Electronic
+ * Library of Mathematics, developed at the Computer Science
+ * Department, University of Bologna, Italy.
+ * 
+ * HELM is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * HELM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HELM; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * 
+ * For details, see the HELM World-Wide-Web page,
+ * http://cs.unibo.it/helm/.
+ *)
+
+(******************************************************************************)
+(*                                                                            *)
+(*                               PROJECT HELM                                 *)
+(*                                                                            *)
+(*                Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>               *)
+(*                                 29/11/2000                                 *)
+(*                                                                            *)
+(*                                                                            *)
+(******************************************************************************)
+
+val helm_dir : string
+val dtd_dir : string
+val style_dir : string
+val servers_file : string
+val uris_dbm : string
+val dest : string
+val indexname : string
+val tmp_dir : string
+val helm_dir : string
+val getter_url : string
+val processor_url : string
+val annotations_dir : string
+val annotations_url : string
index 5ad7c60e2f1b987019c2893209e658613b277936..529d934c78d7ba8f57e3ff8d2c3892bcc67cb093 100644 (file)
@@ -1,2 +1,5 @@
-pxpUriResolver.cmo: csc_pxp_reader.cmo 
-pxpUriResolver.cmx: csc_pxp_reader.cmx 
+pxpUriResolver.cmi: csc_pxp_reader.cmi 
+csc_pxp_reader.cmo: csc_pxp_reader.cmi 
+csc_pxp_reader.cmx: csc_pxp_reader.cmi 
+pxpUriResolver.cmo: csc_pxp_reader.cmi pxpUriResolver.cmi 
+pxpUriResolver.cmx: csc_pxp_reader.cmx pxpUriResolver.cmi 
index 2a89a95f0296b32846d94cc22cc75cc3408c80dd..1ccb4244b6f008650bf0ee6d6650f88270b7e0bd 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = pxp
 REQUIRES = helm-getter
 PREDICATES =
 
-DEPOBJS = csc_pxp_reader.ml pxpUriResolver.ml
-
-OBJECTS = csc_pxp_reader.cmo pxpUriResolver.cmo
+INTERFACE_FILES = csc_pxp_reader.mli pxpUriResolver.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
diff --git a/helm/ocaml/pxp/csc_pxp_reader.mli b/helm/ocaml/pxp/csc_pxp_reader.mli
new file mode 100644 (file)
index 0000000..2d103b3
--- /dev/null
@@ -0,0 +1,46 @@
+exception Not_competent
+exception Not_resolvable of exn
+class type resolver =
+  object
+    method change_encoding : string -> unit
+    method clone : resolver
+    method close_all : unit
+    method close_in : unit
+    method init_rep_encoding : Pxp_types.rep_encoding -> unit
+    method init_warner : Pxp_types.collect_warnings -> unit
+    method open_in : Pxp_types.ext_id -> Lexing.lexbuf
+    method rep_encoding : Pxp_types.rep_encoding
+  end
+class resolve_read_url_channel :
+  ?base_url:Neturl.url ->
+  ?close:(in_channel -> unit) ->
+  url_of_id:(Pxp_types.ext_id -> Neturl.url) ->
+  channel_of_url:(Pxp_types.ext_id ->
+                  Neturl.url -> in_channel * Pxp_types.encoding option) ->
+  unit -> resolver
+type spec = [ `Not_recognized | `Allowed | `Required]
+val make_file_url :
+  ?system_encoding:Netconversion.encoding ->
+  ?enc:Netconversion.encoding -> string -> Neturl.url
+type combination_mode = Public_before_system | System_before_public
+class combine :
+  ?prefer:resolver ->
+  ?mode:combination_mode ->
+  resolver list ->
+  object
+    val mutable active_resolver : resolver option
+    val mutable clones : combine list
+    val mutable internal_encoding : Pxp_types.rep_encoding
+    val mode : combination_mode
+    val prefered_resolver : resolver option
+    val resolvers : resolver list
+    val mutable warner : Pxp_types.drop_warnings
+    method change_encoding : string -> unit
+    method clone : combine
+    method close_all : unit
+    method close_in : unit
+    method init_rep_encoding : Pxp_types.rep_encoding -> unit
+    method init_warner : Pxp_types.collect_warnings -> unit
+    method open_in : Pxp_types.ext_id -> Lexing.lexbuf
+    method rep_encoding : Pxp_types.rep_encoding
+  end
diff --git a/helm/ocaml/pxp/pxpUriResolver.mli b/helm/ocaml/pxp/pxpUriResolver.mli
new file mode 100644 (file)
index 0000000..d2a1210
--- /dev/null
@@ -0,0 +1,4 @@
+val from_file :
+  ?alt:Csc_pxp_reader.resolver list ->
+  ?system_encoding:Netconversion.encoding ->
+  ?enc:Netconversion.encoding -> string -> Pxp_yacc.source
index 2d01dee04d469b338dc2537a6509feffbb41c703..2f21b369e67071edff6fbbab88449b0a5dbf1136 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = urimanager
 REQUIRES = str
 PREDICATES =
 
-DEPOBJS = uriManager.mli uriManager.ml
-
-OBJECTS = uriManager.cmo
+INTERFACE_FILES = uriManager.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common
index f1037d90e9508a371b73bd76917f4ba679a59e15..502cdc18a6bb63cc14177ca29b492949c58b0905 100644 (file)
@@ -2,8 +2,8 @@ PACKAGE = xml
 REQUIRES =
 PREDICATES =
 
-DEPOBJS = xml.mli xml.ml
-
-OBJECTS = xml.cmo
+INTERFACE_FILES = xml.mli
+IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
+EXTRA_OBJECTS_TO_INSTALL =
 
 include ../Makefile.common