Sunday, August 20, 2006

 

Patch

Here is a patch to fix the problem mentioned in the previous post

Index: Makefile.in
===================================================================
RCS file: /cvsroot/camomile/camomile/Makefile.in,v
retrieving revision 1.78
diff -c -r1.78 Makefile.in
*** Makefile.in 19 Aug 2006 07:58:29 -0000 1.78
--- Makefile.in 19 Aug 2006 17:42:28 -0000
***************
*** 94,100 ****
public/caseMap.cmo public/uRe.cmointernal/uReStrParserType.cmointernal/uReStrParser.cmo internal/uReStrLexer.cmo public/uReStr.cmo! public/main.cmo

OBJECTS = $(OBJNOINI) $(OBJECTS_WITH_CONFIG)

--- 94,100 ----
public/caseMap.cmo public/uRe.cmointernal/uReStrParserType.cmointernal/uReStrParser.cmo internal/uReStrLexer.cmo public/uReStr.cmo! public/main.cmo public/default.cmo

OBJECTS = $(OBJNOINI) $(OBJECTS_WITH_CONFIG)

***************
*** 195,201 ****
TOOLSLIB=bigarray.cma str.cma toolslib.cma
OPTTOOLSLIB=$(TOOLSLIB:.cma=.cmxa)

! tools : $(TOOLS) tools/parse_allkeys.byte tools/camomilelocaledef.byte

$(TOOLS) : %.byte : toolslib.cma %.cmo
$(OCAMLC) $(BFLAGS) -o $@ $(TOOLSLIB) $*.cmo
--- 195,201 ----
TOOLSLIB=bigarray.cma str.cma toolslib.cma
OPTTOOLSLIB=$(TOOLSLIB:.cma=.cmxa)

! tools : $(TOOLS)

$(TOOLS) : %.byte : toolslib.cma %.cmo
$(OCAMLC) $(BFLAGS) -o $@ $(TOOLSLIB) $*.cmo
***************
*** 354,360 ****
public/uCharInfo.mli public/uNF.mli public/uCol.mli public/caseMap.mli public/uRe.mli public/uReStr.mli public/charEncoding.mli public/uTF8.mli public/uTF16.mli public/uCS4.mli ! public/uPervasives.mli public/main.mli

install: $(INSTALL) install-data install-bin

--- 354,360 ----
public/uCharInfo.mli public/uNF.mli public/uCol.mli public/caseMap.mli public/uRe.mli public/uReStr.mli public/charEncoding.mli public/uTF8.mli public/uTF16.mli public/uCS4.mli ! public/uPervasives.mli public/main.mli public/default.mli

install: $(INSTALL) install-data install-bin

Index: public/default.ml
===================================================================
RCS file: public/default.ml
diff -N public/default.ml
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- public/default.ml 19 Aug 2006 17:39:40 -0000 1.1
***************
*** 0 ****
--- 1 ----
+ module Camomile = Main.Make(CamomileDefaultConfig)
Index: public/default.mli
===================================================================
RCS file: public/default.mli
diff -N public/default.mli
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- public/default.mli 19 Aug 2006 17:39:40 -0000 1.1
***************
*** 0 ****
--- 1,19 ----
+ (** modules with default configuration. Almost compatible to Camomile 0.6.x *)
+
+ module Camomile : Main.Type with
+ module ISet = ISet and
+ module IMap = IMap and
+ module XArray = XArray and
+ module OOChannel = OOChannel and
+ module UChar = UChar and
+ module USet = USet and
+ module UMap = UMap and
+ module UCharTbl = UCharTbl and
+ module UnicodeString = UnicodeString and
+ module UText = UText and
+ module XString = XString and
+ module SubText = SubText and
+ module ULine = ULine and
+ module UTF8 = UTF8 and
+ module UTF16 = UTF16 and
+ module UCS4 = UCS4
Index: public/main.mlip
===================================================================
RCS file: /cvsroot/camomile/camomile/public/main.mlip,v
retrieving revision 1.2
diff -c -r1.2 main.mlip
*** public/main.mlip 13 Aug 2006 20:29:25 -0000 1.2
--- public/main.mlip 19 Aug 2006 17:42:28 -0000
***************
*** 135,155 ****
module UTF8 = UTF8 and
module UTF16 = UTF16 and
module UCS4 = UCS4
-
- module Camomile : Type with
- module ISet = ISet and
- module IMap = IMap and
- module XArray = XArray and
- module OOChannel = OOChannel and
- module UChar = UChar and
- module USet = USet and
- module UMap = UMap and
- module UCharTbl = UCharTbl and
- module UnicodeString = UnicodeString and
- module UText = UText and
- module XString = XString and
- module SubText = SubText and
- module ULine = ULine and
- module UTF8 = UTF8 and
- module UTF16 = UTF16 and
- module UCS4 = UCS4
--- 135,137 ----
Index: public/main.mlp
===================================================================
RCS file: /cvsroot/camomile/camomile/public/main.mlp,v
retrieving revision 1.3
diff -c -r1.3 main.mlp
*** public/main.mlp 13 Aug 2006 20:29:25 -0000 1.3
--- public/main.mlp 19 Aug 2006 17:42:28 -0000
***************
*** 185,189 ****

module UReStr = UReStr.Configure(Config)
end
-
- module Camomile = Make(CamomileDefaultConfig)
--- 185,187 ----
Index: tools/parse_allkeys.ml
===================================================================
RCS file: /cvsroot/camomile/camomile/tools/parse_allkeys.ml,v
retrieving revision 1.16
diff -c -r1.16 parse_allkeys.ml
*** tools/parse_allkeys.ml 19 Dec 2003 17:24:34 -0000 1.16
--- tools/parse_allkeys.ml 19 Aug 2006 17:42:28 -0000
***************
*** 1,6 ****
--- 1,7 ----
(* $Id: parse_allkeys.ml,v 1.16 2003/12/19 17:24:34 yori Exp $ *)
(* Copyright 2002 Yamagata Yoriyuki *)

+ open Toolslib
open Unidata
open AbsCe

Comments: Post a Comment

Links to this post:

Create a Link



<< Home

This page is powered by Blogger. Isn't yours?