[r2004-06-25 13:50:38 by afrisch] Comment

Original author: afrisch
Date: 2004-06-25 13:50:38+00:00

cdo2cmo/Makefile

@@ -19,22 +19,24 @@ ifeq ($(MODEL),flat)
   UNITS= $(subst utils/,,$(UTILS)) \
          $(subst parsing/,,$(PARSING)) \
          $(subst typing/,,$(TYPING))
+  INCLUDES = -I $(PREFIX)
 else
 ifeq ($(MODEL),tree)
   UNITS= $(UTILS) $(PARSING) $(TYPING)
+  INCLUDES = -I $(PREFIX)/utils -I $(PREFIX)/parsing -I $(PREFIX)/typing
 else
  $(error Set MODEL=flat or MODEL=tree)
 endif
 endif
 
 oCaml_all.cma:
-	ocamlc -pack -o oCaml_all.cmo $(OBJECTS)
+	ocamlc -pack -o oCaml_all.cmo $(INCLUDES) $(OBJECTS)
 	ocamlc -a -o oCaml_all.cma oCaml_all.cmo
 	mv oCaml_all.cma oCaml_all.cmi ..
 	rm -f oCaml_all.*
 
 oCaml_all.cmxa:
-	ocamlopt -pack -o oCaml_all.cmx $(XOBJECTS)
+	ocamlopt -pack -o oCaml_all.cmx $(INCLUDES) $(XOBJECTS)
 	ocamlopt -a -o oCaml_all.cmxa oCaml_all.cmx
 	mv oCaml_all.cmxa oCaml_all.a oCaml_all.cmi ..
 	rm -f oCaml_all.*

cdo2cmo/ml_ocaml.ml

@@ -485,7 +485,11 @@ and translate_type_constr cduce lident map name list =
 and translate_type_desc cduce lident map id = function
   | ML.Types.Tarrow ( lbl, e1, e2, _ ) -> 
       begin
-	(* Don't really know what's happening. *)
+	(* Don't really know what's happening. -- JD *)
+	(* What's going on is that Asttypes has no implementation,
+	   and ocamlc/ocamlopt -pack does'nt handle this properly
+	   in OCaml 3.07. -- AF *)
+
 	let ( lbl : string ) = Obj.magic lbl in
 	let lbl = if compare lbl "" = 0 then None else Some lbl in
 	let te1 = translate_type_expr cduce lident map e1