Merge branch 'new-Rope'

Conflicts:
	test/test.ml

INSTALL.txt

@@ -1,5 +1,5 @@
 (* OASIS_START *)
-(* DO NOT EDIT (digest: d8647aab35472aa99dc849c8470fd60c) *)
+(* DO NOT EDIT (digest: 5ab0562daedc5ecac055660efd427885) *)
 This is the INSTALL file for the ucorelib distribution.
 
 This package uses OASIS to generate its build system. See section OASIS for
@@ -11,6 +11,7 @@ Dependencies
 In order to compile this package, you will need:
 * ocaml
 * findlib
+* batteries (>= 2.1) for library ucorelib
 * oUnit for executable test
 
 Installing

_oasis

@@ -12,6 +12,7 @@ Library ucorelib
   Modules:    UCoreLib
   Build: true
   Install: true
+  BuildDepends: batteries (>= 2.1)
 
 Executable test
   BuildTools: ocamlbuild

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: d1565b51aca25016b55e19f051f934e0)
+# DO NOT EDIT (digest: d494b9845ed839fef1b7c3a7f0a7a07b)
 # Ignore VCS directories, you can use the same kind of rule outside 
 # OASIS_START/STOP if you want to exclude directories that contains 
 # useless stuff for the build process
@@ -15,9 +15,12 @@
 "_darcs": not_hygienic
 # Library ucorelib
 "src/ucorelib.cmxs": use_ucorelib
+<src/*.ml{,i}>: pkg_batteries
 # Executable test
 "test/test.byte": use_ucorelib
 "test/test.byte": pkg_oUnit
+"test/test.byte": pkg_batteries
 <test/*.ml{,i}>: use_ucorelib
 <test/*.ml{,i}>: pkg_oUnit
+<test/*.ml{,i}>: pkg_batteries
 # OASIS_STOP

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 04a1fc378a4fe61d8c9370b5b29330fa) *)
+(* DO NOT EDIT (digest: 911c449ba9cec6648246c74d2a72be6d) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5829,7 +5829,12 @@ let setup_t =
                       bs_install = [(OASISExpr.EBool true, true)];
                       bs_path = "src";
                       bs_compiled_object = Best;
-                      bs_build_depends = [];
+                      bs_build_depends =
+                        [
+                           FindlibPackage
+                             ("batteries",
+                               Some (OASISVersion.VGreaterEqual "2.1"))
+                        ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
                       bs_data_files = [];
@@ -5936,14 +5941,15 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest = Some "\150\245\003HB\161c\213\160i\153\236V\015l\145";
+     oasis_digest =
+       Some "\019\243q\247\158 \231\252\201\141\022\203\145\137\004\140";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
      };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 5948 "setup.ml"
+# 5954 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;

src/META

@@ -1,7 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 233061cbaf77fc5d77d38b183e9c0a38)
+# DO NOT EDIT (digest: 368ebddb8be14c2681f69deed84d954a)
 version = "0.0.1"
 description = "A light weight Unicode library for OCaml"
+requires = "batteries"
 archive(byte) = "ucorelib.cma"
 archive(byte, plugin) = "ucorelib.cma"
 archive(native) = "ucorelib.cmxa"