Update code for Camomile 0.8.

diff --git a/.depend b/.depend
index a43d14c..d464362 100644 (file)
--- a/.depend
+++ b/.depend
@@ -1,40 +1,40 @@
-cmdline.cmi: 
-cmdline.cmo: utils.cmi config.cmi cmdline.cmi 
-cmdline.cmx: utils.cmx config.cmx cmdline.cmi 
-config.cmi: 
-config.cmo: config.cmi 
-config.cmx: config.cmi 
-deviceSet.cmi: 
-deviceSet.cmo: deviceSet.cmi 
-deviceSet.cmx: deviceSet.cmi 
-filetree.cmi: slave_types.cmi 
-filetree.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi filetree_ops.cmi filetree_markup.cmi deviceSet.cmi config.cmi filetree.cmi 
-filetree.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmx filetree_ops.cmx filetree_markup.cmx deviceSet.cmx config.cmx filetree.cmi 
-filetree_markup.cmi: slave_types.cmi filetree_type.cmi 
-filetree_markup.cmo: utils.cmi slave_types.cmi filetree_type.cmi filetree_markup.cmi 
-filetree_markup.cmx: utils.cmx slave_types.cmx filetree_type.cmx filetree_markup.cmi 
-filetree_ops.cmi: slave_types.cmi filetree_type.cmi 
-filetree_ops.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi filetree_markup.cmi filetree_ops.cmi 
-filetree_ops.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmx filetree_markup.cmx filetree_ops.cmi 
-filetree_type.cmi: slave_types.cmi slave.cmi 
-filetree_type.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi 
-filetree_type.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmi 
-main.cmo: window.cmi utils.cmi slave.cmi config.cmi cmdline.cmi 
-main.cmx: window.cmx utils.cmx slave.cmx config.cmx cmdline.cmx 
-slave.cmi: slave_types.cmi 
-slave.cmo: utils.cmi slave_utils.cmi slave_types.cmi slave.cmi 
-slave.cmx: utils.cmx slave_utils.cmx slave_types.cmx slave.cmi 
-slave_types.cmi: 
-slave_types.cmo: slave_types.cmi 
-slave_types.cmx: slave_types.cmi 
-slave_utils.cmi: slave_types.cmi 
-slave_utils.cmo: utils.cmi slave_types.cmi slave_utils.cmi 
-slave_utils.cmx: utils.cmx slave_types.cmx slave_utils.cmi 
-throbber.cmo: 
-throbber.cmx: 
-utils.cmi: 
-utils.cmo: config.cmi utils.cmi 
-utils.cmx: config.cmx utils.cmi 
-window.cmi: cmdline.cmi 
-window.cmo: utils.cmi throbber.cmo slave_types.cmi slave.cmi filetree.cmi cmdline.cmi window.cmi 
-window.cmx: utils.cmx throbber.cmx slave_types.cmx slave.cmx filetree.cmx cmdline.cmx window.cmi 
+cmdline.cmi:
+cmdline.cmo: utils.cmi config.cmi cmdline.cmi
+cmdline.cmx: utils.cmx config.cmx cmdline.cmi
+config.cmi:
+config.cmo: config.cmi
+config.cmx: config.cmi
+deviceSet.cmi:
+deviceSet.cmo: deviceSet.cmi
+deviceSet.cmx: deviceSet.cmi
+filetree.cmi: slave_types.cmi
+filetree.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi filetree_ops.cmi filetree_markup.cmi deviceSet.cmi config.cmi filetree.cmi
+filetree.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmx filetree_ops.cmx filetree_markup.cmx deviceSet.cmx config.cmx filetree.cmi
+filetree_markup.cmi: slave_types.cmi filetree_type.cmi
+filetree_markup.cmo: utils.cmi slave_types.cmi filetree_type.cmi filetree_markup.cmi
+filetree_markup.cmx: utils.cmx slave_types.cmx filetree_type.cmx filetree_markup.cmi
+filetree_ops.cmi: slave_types.cmi filetree_type.cmi
+filetree_ops.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi filetree_markup.cmi filetree_ops.cmi
+filetree_ops.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmx filetree_markup.cmx filetree_ops.cmi
+filetree_type.cmi: slave_types.cmi slave.cmi
+filetree_type.cmo: utils.cmi slave_types.cmi slave.cmi filetree_type.cmi
+filetree_type.cmx: utils.cmx slave_types.cmx slave.cmx filetree_type.cmi
+main.cmo: window.cmi utils.cmi slave.cmi config.cmi cmdline.cmi
+main.cmx: window.cmx utils.cmx slave.cmx config.cmx cmdline.cmx
+slave.cmi: slave_types.cmi
+slave.cmo: utils.cmi slave_utils.cmi slave_types.cmi slave.cmi
+slave.cmx: utils.cmx slave_utils.cmx slave_types.cmx slave.cmi
+slave_types.cmi:
+slave_types.cmo: slave_types.cmi
+slave_types.cmx: slave_types.cmi
+slave_utils.cmi: slave_types.cmi
+slave_utils.cmo: utils.cmi slave_types.cmi slave_utils.cmi
+slave_utils.cmx: utils.cmx slave_types.cmx slave_utils.cmi
+throbber.cmo:
+throbber.cmx:
+utils.cmi:
+utils.cmo: config.cmi utils.cmi
+utils.cmx: config.cmx utils.cmi
+window.cmi: cmdline.cmi
+window.cmo: utils.cmi throbber.cmo slave_types.cmi slave.cmi filetree.cmi cmdline.cmi window.cmi
+window.cmx: utils.cmx throbber.cmx slave_types.cmx slave.cmx filetree.cmx cmdline.cmx window.cmi

diff --git a/Makefile.am b/Makefile.am
index 552abe8..21cab22 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ EXTRA_DIST = \
        guestfs-browser.1 \
        html/pod.css
 
-CLEANFILES = *.cmi *.cmo *.cmx *.o guestfs-browser *~
+CLEANFILES = *.cmi *.cmo *.cmx *.cmxa *.o guestfs-browser *~
 
 # These are listed here in alphabetical order.
 SOURCES = \

diff --git a/README b/README
index 4b8ffef..69d41b1 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Guest filesystem browser
-Copyright (C) 2010 Red Hat Inc.
+Copyright (C) 2010-2011 Red Hat Inc.
 
 To compile from source, install the prerequisites (run the ./configure
 script and it will tell you what's missing).

diff --git a/configure.ac b/configure.ac
index e88fb41..5ea8da1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,7 @@ fi
 
 AC_CHECK_OCAML_PKG([camomile])
 if test "$OCAML_PKG_camomile" = "no"; then
-    AC_MSG_ERROR([Please install OCaml module 'camomile' (including the data module if that is separate).])
+    AC_MSG_ERROR([Please install OCaml module 'camomile' (>= 0.8, including the data module if that is separate).])
 fi
 
 AC_CHECK_OCAML_PKG([bitstring])

diff --git a/filetree.ml b/filetree.ml
index 275c868..a68dd8b 100644 (file)
--- a/filetree.ml
+++ b/filetree.ml
@@ -30,6 +30,7 @@ open Filetree_markup
 open Filetree_ops
 
 module G = Guestfs
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
 
 type t = Filetree_type.t
 

diff --git a/filetree_markup.ml b/filetree_markup.ml
index ebae98b..8b8dc2e 100644 (file)
--- a/filetree_markup.ml
+++ b/filetree_markup.ml
@@ -18,8 +18,6 @@
 
 open ExtString
 open ExtList
-open CamomileLibrary
-open Default.Camomile
 open Unix
 
 open Utils

diff --git a/slave.ml b/slave.ml
index e605a21..7fcfb08 100644 (file)
--- a/slave.ml
+++ b/slave.ml
@@ -18,8 +18,6 @@
 
 open ExtList
 open ExtString
-open CamomileLibrary
-open Default.Camomile
 
 open Utils
 
@@ -34,6 +32,8 @@ module D = Libvirt.Domain
 module G = Guestfs
 module M = Mutex
 module Q = Queue
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
+
 
 type 'a callback = 'a -> unit
 

diff --git a/slave_utils.ml b/slave_utils.ml
index daa7463..41d64ac 100644 (file)
--- a/slave_utils.ml
+++ b/slave_utils.ml
@@ -18,8 +18,6 @@
 
 open ExtList
 open ExtString
-open CamomileLibrary
-open Default.Camomile
 
 open Utils
 

diff --git a/utils.ml b/utils.ml
index e0c2ff1..0bf18fa 100644 (file)
--- a/utils.ml
+++ b/utils.ml
@@ -18,8 +18,6 @@
 
 open ExtString
 open ExtList
-open CamomileLibrary
-open Default.Camomile
 
 open Printf
 
@@ -164,9 +162,12 @@ let tmpdir () =
        ignore (Sys.command cmd));
   tmpdir
 
-let utf16le = CharEncoding.utf16le
-let utf8 = CharEncoding.utf8
-let recode = CharEncoding.recode_string ~in_enc:utf16le ~out_enc:utf8
+module CE = CamomileLibraryDefault.Camomile.CharEncoding
+module UTF8 = CamomileLibraryDefault.Camomile.UTF8
+module UChar = CamomileLibraryDefault.Camomile.UChar
+let utf16le = CE.utf16le
+let utf8 = CE.utf8
+let recode = CE.recode_string ~in_enc:utf16le ~out_enc:utf8
 
 let windows_string_to_utf8 str =
   let str = recode str in