mlvirtmanager renamed as virt-ctrl.

	* .hgignore, Makefile.in, configure.ac: Rename
	  mlvirtmanager as virt-ctrl to avoid any confusion with
	  the real virt-manager.
	* mlvirtmanager/, virt-ctrl/: Subdirectory moved.
	* README: Supporting documentation updated.

diff --git a/.hgignore b/.hgignore
index 098c551..b7ad4a6 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -27,7 +27,7 @@ core.*
 libvirt/libvirt_version.ml
 examples/list_domains
 mlvirsh/mlvirsh
 libvirt/libvirt_version.ml
 examples/list_domains
 mlvirsh/mlvirsh

-mlvirtmanager/mlvirtmanager
+virt-ctrl/virt-ctrl

 virt-top/virt-top
 virt-df/virt-df
 wininstaller.nsis
\ No newline at end of file
 virt-top/virt-top
 virt-df/virt-df
 wininstaller.nsis
\ No newline at end of file

diff --git a/ChangeLog b/ChangeLog
index c8f24f9..72e0f4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-01-07  Richard Jones  <rjones@redhat.com>
 
 2008-01-07  Richard Jones  <rjones@redhat.com>
 

+       mlvirtmanager renamed as virt-ctrl.
+       * .hgignore, Makefile.in, configure.ac: Rename
+         mlvirtmanager as virt-ctrl to avoid any confusion with
+         the real virt-manager.
+       * mlvirtmanager/, virt-ctrl/: Subdirectory moved.
+       * README: Supporting documentation updated.
+

        Include mlvirtmanager in the Windows installer.
        * wininstaller.nsis.in: Include mlvirtmanager in the Windows
          installer.
        Include mlvirtmanager in the Windows installer.
        * wininstaller.nsis.in: Include mlvirtmanager in the Windows
          installer.

diff --git a/MANIFEST b/MANIFEST
old mode 100755 (executable)
new mode 100644 (file)
index 93cf0da..d79d67e
--- a/MANIFEST
+++ b/MANIFEST
@@ -23,17 +23,17 @@ META.in
 mlvirsh/.depend
 mlvirsh/Makefile.in
 mlvirsh/mlvirsh.ml
 mlvirsh/.depend
 mlvirsh/Makefile.in
 mlvirsh/mlvirsh.ml

-mlvirtmanager/.depend
-mlvirtmanager/Makefile.in
-mlvirtmanager/mlvirtmanager_connections.ml
-mlvirtmanager/mlvirtmanager_connections.mli
-mlvirtmanager/mlvirtmanager_domain_ops.ml
-mlvirtmanager/mlvirtmanager_domain_ops.mli
-mlvirtmanager/mlvirtmanager_helpers.ml
-mlvirtmanager/mlvirtmanager_helpers.mli
-mlvirtmanager/mlvirtmanager_mainwindow.ml
-mlvirtmanager/mlvirtmanager_mainwindow.mli
-mlvirtmanager/mlvirtmanager.ml
+virt-ctrl/.depend
+virt-ctrl/Makefile.in
+virt-ctrl/vc_connections.ml
+virt-ctrl/vc_connections.mli
+virt-ctrl/vc_domain_ops.ml
+virt-ctrl/vc_domain_ops.mli
+virt-ctrl/vc_helpers.ml
+virt-ctrl/vc_helpers.mli
+virt-ctrl/vc_mainwindow.ml
+virt-ctrl/vc_mainwindow.mli
+virt-ctrl/virt_ctrl.ml

 README
 TODO.libvirt
 TODO.virt-top
 README
 TODO.libvirt
 TODO.virt-top

diff --git a/Makefile.in b/Makefile.in
index 172b103..53a6829 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,7 @@ clean:
        done
        rm -f examples/list_domains
        rm -f mlvirsh/mlvirsh
        done
        rm -f examples/list_domains
        rm -f mlvirsh/mlvirsh

-       rm -f mlvirtmanager/mlvirtmanager
+       rm -f virt-ctrl/virt-ctrl

        rm -f virt-top/virt-top
        rm -f virt-df/virt-df
 
        rm -f virt-top/virt-top
        rm -f virt-df/virt-df
 


@@ -52,7 +52,7 @@ distclean: clean
        rm -f libvirt/Makefile
        rm -f examples/Makefile
        rm -f mlvirsh/Makefile
        rm -f libvirt/Makefile
        rm -f examples/Makefile
        rm -f mlvirsh/Makefile

-       rm -f mlvirtmanager/Makefile
+       rm -f virt-ctrl/Makefile

        rm -f virt-top/Makefile
        rm -f virt-df/Makefile
 
        rm -f virt-top/Makefile
        rm -f virt-df/Makefile
 

diff --git a/README b/README
index 02be231..67e5ab4 100644 (file)
--- a/README
+++ b/README
@@ -39,7 +39,7 @@ To build virt-top (optional):
   The other packages are not required, but you will get reduced
   functionality].
 
   The other packages are not required, but you will get reduced
   functionality].
 

-To build mlvirtmanager (optional):
+To build virt-ctrl (optional):

 
   GTK2 (from http://gtk.org/)
   lablgtk2 (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html)
 
   GTK2 (from http://gtk.org/)
   lablgtk2 (from http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html)


@@ -76,7 +76,7 @@ Building
 
   make doc              # Build HTML documentation in html/ subdirectory.
 
 
   make doc              # Build HTML documentation in html/ subdirectory.
 

-Then have a look at the programs 'mlvirsh.opt' and 'mlvirtmanager.opt'.
+Then have a look at the programs 'mlvirsh.opt' and 'virt-ctrl.opt'.

 
 Note: If you want to run the programs without first installing, you
 may need to set your $LD_LIBRARY_PATH environment variable so it
 
 Note: If you want to run the programs without first installing, you
 may need to set your $LD_LIBRARY_PATH environment variable so it


@@ -88,9 +88,9 @@ contains the build directory.  eg:
 Windows
 ----------------------------------------------------------------------
 
 Windows
 ----------------------------------------------------------------------
 

-I have built libvirt (the bindings), examples, mlvirsh and
-mlvirtmanager on Windows using the MinGW port of OCaml.  It's quite
-likely that it will also work under VC++, but I have not tested this.
+I have built libvirt (the bindings), examples, mlvirsh and virt-ctrl
+on Windows using the MinGW port of OCaml.  It's quite likely that it
+will also work under VC++, but I have not tested this.

 
 You should make sure that your $PATH (environment variable) contains
 the names of the directories containing all required DLLs, in
 
 You should make sure that your $PATH (environment variable) contains
 the names of the directories containing all required DLLs, in


@@ -103,7 +103,7 @@ particular you will require:
   libtasn1-*.dll
   libxdr.dll           (from libxdr)
   libxml2-*.dll                (from libxml2)
   libtasn1-*.dll
   libxdr.dll           (from libxdr)
   libxml2-*.dll                (from libxml2)

-  and, a multitude of DLLs from GTK if you want to run mlvirtmanager
+  and, a multitude of DLLs from GTK if you want to run virt-ctrl

 
 You can use a tool such as Dependency Walker to find/check the
 locations of dependent libraries.
 
 You can use a tool such as Dependency Walker to find/check the
 locations of dependent libraries.


@@ -138,15 +138,15 @@ At the time of writing:
   % size        15%    13%
 
 
   % size        15%    13%
 
 

-mlvirtmanager
+virt-ctrl

 ----------------------------------------------------------------------
 
 ----------------------------------------------------------------------
 

-'mlvirtmanager' is a demonstration implementation of virt-manager in
-OCaml.  It is not feature-complete by any means, but does allow you to
-show the running domains and start and stop defined domains.  The main
-functionality _missing_ is the ability to define new virtual machines,
-change the resources allocated to domains, or show the machine
-console.
+'virt-ctrl' (originally called 'mlvirtmanager') is a reimplementation
+of virt-manager in OCaml.  It is not feature-complete by any means,
+but does allow you to show the running domains and start and stop
+defined domains.  The main functionality _missing_ is the ability to
+define new virtual machines, change the resources allocated to
+domains, or show the machine console.

 
 
 Programming
 
 
 Programming


@@ -191,5 +191,6 @@ Subdirectories
 libvirt/               The OCaml bindings.
 examples/              Some example programs using the bindings.
 mlvirsh/               'mlvirsh' command line tool.
 libvirt/               The OCaml bindings.
 examples/              Some example programs using the bindings.
 mlvirsh/               'mlvirsh' command line tool.

-mlvirtmanager/         'mlvirtmanager' graphical tool.
+virt-ctrl/             'virt-ctrl' graphical tool.

 virt-top/              'virt-top' tool.
 virt-top/              'virt-top' tool.

+virt-df/               'virt-df' tool.
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 2920cf3..4baa04a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -134,7 +134,7 @@ fi
 dnl Which subpackages (== subdirs) will we build?
 subdirs="libvirt examples mlvirsh"
 if test "x$pkg_lablgtk2" != "xno"; then
 dnl Which subpackages (== subdirs) will we build?
 subdirs="libvirt examples mlvirsh"
 if test "x$pkg_lablgtk2" != "xno"; then

-    subdirs="$subdirs mlvirtmanager"
+    subdirs="$subdirs virt-ctrl"

 fi
 if test "x$pkg_extlib" != "xno" -a "x$pkg_curses" != "xno"; then
     subdirs="$subdirs virt-top"
 fi
 if test "x$pkg_extlib" != "xno" -a "x$pkg_curses" != "xno"; then
     subdirs="$subdirs virt-top"


@@ -251,7 +251,7 @@ AC_CONFIG_FILES([META
        libvirt/Makefile
        examples/Makefile
        mlvirsh/Makefile
        libvirt/Makefile
        examples/Makefile
        mlvirsh/Makefile

-       mlvirtmanager/Makefile
+       virt-ctrl/Makefile

        virt-top/Makefile
        virt-df/Makefile
        ])
        virt-top/Makefile
        virt-df/Makefile
        ])

diff --git a/mlvirtmanager/.depend b/mlvirtmanager/.depend
deleted file mode 100755 (executable)
index 01a1aa6..0000000
--- a/mlvirtmanager/.depend
+++ /dev/null
@@ -1,22 +0,0 @@
-mlvirtmanager_connections.cmi: ../libvirt/libvirt.cmi 
-mlvirtmanager_domain_ops.cmi: mlvirtmanager_connections.cmi 
-mlvirtmanager_helpers.cmi: ../libvirt/libvirt.cmi 
-mlvirtmanager_mainwindow.cmi: mlvirtmanager_connections.cmi 
-mlvirtmanager_connections.cmo: mlvirtmanager_helpers.cmi \
-    ../libvirt/libvirt.cmi mlvirtmanager_connections.cmi 
-mlvirtmanager_connections.cmx: mlvirtmanager_helpers.cmx \
-    ../libvirt/libvirt.cmx mlvirtmanager_connections.cmi 
-mlvirtmanager_domain_ops.cmo: mlvirtmanager_connections.cmi \
-    ../libvirt/libvirt.cmi mlvirtmanager_domain_ops.cmi 
-mlvirtmanager_domain_ops.cmx: mlvirtmanager_connections.cmx \
-    ../libvirt/libvirt.cmx mlvirtmanager_domain_ops.cmi 
-mlvirtmanager_helpers.cmo: ../libvirt/libvirt.cmi mlvirtmanager_helpers.cmi 
-mlvirtmanager_helpers.cmx: ../libvirt/libvirt.cmx mlvirtmanager_helpers.cmi 
-mlvirtmanager_mainwindow.cmo: mlvirtmanager_connections.cmi \
-    ../libvirt/libvirt.cmi mlvirtmanager_mainwindow.cmi 
-mlvirtmanager_mainwindow.cmx: mlvirtmanager_connections.cmx \
-    ../libvirt/libvirt.cmx mlvirtmanager_mainwindow.cmi 
-mlvirtmanager.cmo: mlvirtmanager_mainwindow.cmi mlvirtmanager_domain_ops.cmi \
-    mlvirtmanager_connections.cmi 
-mlvirtmanager.cmx: mlvirtmanager_mainwindow.cmx mlvirtmanager_domain_ops.cmx \
-    mlvirtmanager_connections.cmx 

diff --git a/virt-ctrl/.depend b/virt-ctrl/.depend
new file mode 100644 (file)
index 0000000..8e2cdb6
--- /dev/null
+++ b/virt-ctrl/.depend
@@ -0,0 +1,18 @@
+vc_connections.cmi: ../libvirt/libvirt.cmi 
+vc_domain_ops.cmi: vc_connections.cmi 
+vc_helpers.cmi: ../libvirt/libvirt.cmi 
+vc_mainwindow.cmi: vc_connections.cmi 
+vc_connections.cmo: vc_helpers.cmi ../libvirt/libvirt.cmi vc_connections.cmi 
+vc_connections.cmx: vc_helpers.cmx ../libvirt/libvirt.cmx vc_connections.cmi 
+vc_domain_ops.cmo: vc_connections.cmi ../libvirt/libvirt.cmi \
+    vc_domain_ops.cmi 
+vc_domain_ops.cmx: vc_connections.cmx ../libvirt/libvirt.cmx \
+    vc_domain_ops.cmi 
+vc_helpers.cmo: ../libvirt/libvirt.cmi vc_helpers.cmi 
+vc_helpers.cmx: ../libvirt/libvirt.cmx vc_helpers.cmi 
+vc_mainwindow.cmo: vc_connections.cmi ../libvirt/libvirt.cmi \
+    vc_mainwindow.cmi 
+vc_mainwindow.cmx: vc_connections.cmx ../libvirt/libvirt.cmx \
+    vc_mainwindow.cmi 
+virt_ctrl.cmo: vc_mainwindow.cmi vc_domain_ops.cmi vc_connections.cmi 
+virt_ctrl.cmx: vc_mainwindow.cmx vc_domain_ops.cmx vc_connections.cmx 

diff --git a/mlvirtmanager/Makefile.in b/virt-ctrl/Makefile.in
similarity index 77%
rename from mlvirtmanager/Makefile.in
rename to virt-ctrl/Makefile.in
index b9bf280..c6966a8 100644 (file)
--- a/mlvirtmanager/Makefile.in
+++ b/virt-ctrl/Makefile.in
@@ -1,4 +1,4 @@
-# mlvirtmanager
+# virt-ctrl (originally called mlvirtmanager)

 # Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 2007 Red Hat Inc., Richard W.M. Jones
 #
 # This program is free software; you can redistribute it and/or modify


@@ -42,46 +42,46 @@ endif
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
 
 export LIBRARY_PATH=../libvirt
 export LD_LIBRARY_PATH=../libvirt
 

-BYTE_TARGETS   := mlvirtmanager
-OPT_TARGETS    := mlvirtmanager.opt
+BYTE_TARGETS   := virt-ctrl
+OPT_TARGETS    := virt-ctrl.opt

 
 

-VIRTMANAGER_OBJS := \
-       mlvirtmanager_helpers.cmo \
-       mlvirtmanager_connections.cmo \
-       mlvirtmanager_domain_ops.cmo \
-       mlvirtmanager_mainwindow.cmo \
-       mlvirtmanager.cmo
+OBJS := \
+       vc_helpers.cmo \
+       vc_connections.cmo \
+       vc_domain_ops.cmo \
+       vc_mainwindow.cmo \
+       virt_ctrl.cmo

 
 

-VIRTMANAGER_XOBJS := $(VIRTMANAGER_OBJS:.cmo=.cmx)
+XOBJS := $(OBJS:.cmo=.cmx)

 
 all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
 ifneq ($(OCAMLFIND),)
 
 all: $(BYTE_TARGETS)
 
 opt: $(OPT_TARGETS)
 
 ifneq ($(OCAMLFIND),)

-mlvirtmanager: $(VIRTMANAGER_OBJS)
+virt-ctrl: $(OBJS)

        $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
          ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 
        $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
          ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 

-mlvirtmanager.opt: $(VIRTMANAGER_XOBJS)
+virt-ctrl.opt: $(XOBJS)

        $(OCAMLFIND) ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
 else
        $(OCAMLFIND) ocamlopt \
          $(OCAMLOPTPACKAGES) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
 else

-mlvirtmanager: $(VIRTMANAGER_OBJS)
+virt-ctrl: $(OBJS)

        $(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
          ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 
        $(OCAMLC) $(OCAMLCINCS) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
          ../libvirt/mllibvirt.cma gtkInit.cmo -o $@ $^
 

-mlvirtmanager.opt: $(VIRTMANAGER_XOBJS)
+virt-ctrl.opt: $(XOBJS)

        $(OCAMLOPT) -verbose $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          -cclib "$(LDFLAGS)" \
          ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
 endif
 
 install:
        $(OCAMLOPT) -verbose $(OCAMLOPTINCS) $(OCAMLOPTFLAGS) $(OCAMLOPTLIBS) \
          -cclib "$(LDFLAGS)" \
          ../libvirt/mllibvirt.cmxa gtkInit.cmx -o $@ $^
 endif
 
 install:

-       if [ -x mlvirtmanager.opt ]; then \
+       if [ -x virt-ctrl.opt ]; then \

          mkdir -p $(DESTDIR)$(bindir); \
          mkdir -p $(DESTDIR)$(bindir); \

-         $(INSTALL) -m 0755 mlvirtmanager.opt $(DESTDIR)$(bindir)/mlvirtmanager; \
+         $(INSTALL) -m 0755 virt-ctrl.opt $(DESTDIR)$(bindir)/virt-ctrl; \

        fi
 
 include ../Make.rules
        fi
 
 include ../Make.rules

diff --git a/mlvirtmanager/mlvirtmanager_connections.ml b/virt-ctrl/vc_connections.ml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from mlvirtmanager/mlvirtmanager_connections.ml
rename to virt-ctrl/vc_connections.ml
index e72ffcd..78388c1
--- a/mlvirtmanager/mlvirtmanager_connections.ml
+++ b/virt-ctrl/vc_connections.ml
@@ -23,7 +23,7 @@ module C = Libvirt.Connect
 module D = Libvirt.Domain
 module N = Libvirt.Network
 
 module D = Libvirt.Domain
 module N = Libvirt.Network
 

-open Mlvirtmanager_helpers
+open Vc_helpers

 
 (* List of currently open connections.  Actually it's a list of
  * (id, Libvirt.Connect.t) so that we can easily identify
 
 (* List of currently open connections.  Actually it's a list of
  * (id, Libvirt.Connect.t) so that we can easily identify

diff --git a/mlvirtmanager/mlvirtmanager_connections.mli b/virt-ctrl/vc_connections.mli
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from mlvirtmanager/mlvirtmanager_connections.mli
rename to virt-ctrl/vc_connections.mli

diff --git a/mlvirtmanager/mlvirtmanager_domain_ops.ml b/virt-ctrl/vc_domain_ops.ml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from mlvirtmanager/mlvirtmanager_domain_ops.ml
rename to virt-ctrl/vc_domain_ops.ml
index 6de6c59..cbe7a98
--- a/mlvirtmanager/mlvirtmanager_domain_ops.ml
+++ b/virt-ctrl/vc_domain_ops.ml
@@ -27,7 +27,7 @@ module N = Libvirt.Network
 
 (* Get the selected domain (if there is one) or return None. *)
 let get_domain (tree : GTree.view) (model : GTree.tree_store)
 
 (* Get the selected domain (if there is one) or return None. *)
 let get_domain (tree : GTree.view) (model : GTree.tree_store)

-    (columns : Mlvirtmanager_connections.columns) =
+    (columns : Vc_connections.columns) =

   let path, _ = tree#get_cursor () in
   match path with
   | None -> None                       (* No row at all selected. *)
   let path, _ = tree#get_cursor () in
   match path with
   | None -> None                       (* No row at all selected. *)


@@ -44,7 +44,7 @@ let get_domain (tree : GTree.view) (model : GTree.tree_store)
            let (_, col_domname, _, _, _, col_id) = columns in
            let conn_id = model#get ~row:parent ~column:col_id in
            let conn =
            let (_, col_domname, _, _, _, col_id) = columns in
            let conn_id = model#get ~row:parent ~column:col_id in
            let conn =

-             List.assoc conn_id (Mlvirtmanager_connections.get_conns ()) in
+             List.assoc conn_id (Vc_connections.get_conns ()) in

            let domid = model#get ~row ~column:col_id in
            if domid = -1 then (        (* Inactive domain. *)
              let domname = model#get ~row ~column:col_domname in
            let domid = model#get ~row ~column:col_id in
            if domid = -1 then (        (* Inactive domain. *)
              let domname = model#get ~row ~column:col_domname in

diff --git a/mlvirtmanager/mlvirtmanager_domain_ops.mli b/virt-ctrl/vc_domain_ops.mli
old mode 100755 (executable)
new mode 100644 (file)
similarity index 67%
rename from mlvirtmanager/mlvirtmanager_domain_ops.mli
rename to virt-ctrl/vc_domain_ops.mli
index fd1bfc9..0b8e2b7
--- a/mlvirtmanager/mlvirtmanager_domain_ops.mli
+++ b/virt-ctrl/vc_domain_ops.mli
@@ -19,7 +19,7 @@
    Domain operations buttons.
 *)
 
    Domain operations buttons.
 *)
 

-val start_domain : GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit
-val pause_domain : GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit
-val resume_domain : GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit
-val shutdown_domain : GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit
+val start_domain : GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit
+val pause_domain : GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit
+val resume_domain : GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit
+val shutdown_domain : GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit

diff --git a/mlvirtmanager/mlvirtmanager_helpers.ml b/virt-ctrl/vc_helpers.ml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from mlvirtmanager/mlvirtmanager_helpers.ml
rename to virt-ctrl/vc_helpers.ml

diff --git a/mlvirtmanager/mlvirtmanager_helpers.mli b/virt-ctrl/vc_helpers.mli
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from mlvirtmanager/mlvirtmanager_helpers.mli
rename to virt-ctrl/vc_helpers.mli

diff --git a/mlvirtmanager/mlvirtmanager_mainwindow.ml b/virt-ctrl/vc_mainwindow.ml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 97%
rename from mlvirtmanager/mlvirtmanager_mainwindow.ml
rename to virt-ctrl/vc_mainwindow.ml
index 918c9a6..3ed8add
--- a/mlvirtmanager/mlvirtmanager_mainwindow.ml
+++ b/virt-ctrl/vc_mainwindow.ml
@@ -109,7 +109,7 @@ let make ~open_connection
 
   (* The treeview. *)
   let (tree, model, columns, initial_state) =
 
   (* The treeview. *)
   let (tree, model, columns, initial_state) =

-    Mlvirtmanager_connections.make_treeview
+    Vc_connections.make_treeview

       ~packing:(vbox#pack ~expand:true ~fill:true) () in
 
   ignore (start_button#connect#clicked
       ~packing:(vbox#pack ~expand:true ~fill:true) () in
 
   ignore (start_button#connect#clicked


@@ -124,7 +124,7 @@ let make ~open_connection
   (* Make a timeout function which is called once per second. *)
   let state = ref initial_state in
   let callback () =
   (* Make a timeout function which is called once per second. *)
   let state = ref initial_state in
   let callback () =

-    state := Mlvirtmanager_connections.repopulate tree model columns !state;
+    state := Vc_connections.repopulate tree model columns !state;

     true
   in
   let timeout_id = GMain.Timeout.add ~ms:1000 ~callback in
     true
   in
   let timeout_id = GMain.Timeout.add ~ms:1000 ~callback in

diff --git a/mlvirtmanager/mlvirtmanager_mainwindow.mli b/virt-ctrl/vc_mainwindow.mli
old mode 100755 (executable)
new mode 100644 (file)
similarity index 70%
rename from mlvirtmanager/mlvirtmanager_mainwindow.mli
rename to virt-ctrl/vc_mainwindow.mli
index 22fce47..eb99b63
--- a/mlvirtmanager/mlvirtmanager_mainwindow.mli
+++ b/virt-ctrl/vc_mainwindow.mli
@@ -23,7 +23,7 @@
     callback functions to wire everything up.
 *)
 val make : open_connection:(unit -> unit) ->
     callback functions to wire everything up.
 *)
 val make : open_connection:(unit -> unit) ->

-  start_domain:(GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit) ->
-  pause_domain:(GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit) ->
-  resume_domain:(GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit) ->
-  shutdown_domain:(GTree.view -> GTree.tree_store -> Mlvirtmanager_connections.columns -> unit -> unit) -> unit
+  start_domain:(GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit) ->
+  pause_domain:(GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit) ->
+  resume_domain:(GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit) ->
+  shutdown_domain:(GTree.view -> GTree.tree_store -> Vc_connections.columns -> unit -> unit) -> unit

diff --git a/mlvirtmanager/mlvirtmanager.ml b/virt-ctrl/virt_ctrl.ml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 74%
rename from mlvirtmanager/mlvirtmanager.ml
rename to virt-ctrl/virt_ctrl.ml
index 12382fe..8a01a04
--- a/mlvirtmanager/mlvirtmanager.ml
+++ b/virt-ctrl/virt_ctrl.ml
@@ -21,12 +21,12 @@ open Printf
 
 let () =
   (* Build the main window and wire up the buttons to the callback functions *)
 
 let () =
   (* Build the main window and wire up the buttons to the callback functions *)

-  Mlvirtmanager_mainwindow.make
-    ~open_connection:Mlvirtmanager_connections.open_connection
-    ~start_domain:Mlvirtmanager_domain_ops.start_domain
-    ~pause_domain:Mlvirtmanager_domain_ops.pause_domain
-    ~resume_domain:Mlvirtmanager_domain_ops.resume_domain
-    ~shutdown_domain:Mlvirtmanager_domain_ops.shutdown_domain;
+  Vc_mainwindow.make
+    ~open_connection:Vc_connections.open_connection
+    ~start_domain:Vc_domain_ops.start_domain
+    ~pause_domain:Vc_domain_ops.pause_domain
+    ~resume_domain:Vc_domain_ops.resume_domain
+    ~shutdown_domain:Vc_domain_ops.shutdown_domain;

 
   (* Enter the Gtk main loop. *)
   GMain.main ()
 
   (* Enter the Gtk main loop. *)
   GMain.main ()

diff --git a/wininstaller.nsis.in b/wininstaller.nsis.in
index 92c5789..1b7ad35 100644 (file)
--- a/wininstaller.nsis.in
+++ b/wininstaller.nsis.in
@@ -86,7 +86,7 @@ SectionEnd
 Section "Programs (recommended)"\r
        SetOutPath $INSTDIR\r
        File "/oname=mlvirsh.exe" "mlvirsh\mlvirsh.opt"\r
 Section "Programs (recommended)"\r
        SetOutPath $INSTDIR\r
        File "/oname=mlvirsh.exe" "mlvirsh\mlvirsh.opt"\r

-       File "/oname=mlvirtmanager.exe" "mlvirsh\mlvirtmanager.opt"\r
+       File "/oname=virt-ctrl.exe" "mlvirsh\virt-ctrl.opt"\r

 SectionEnd\r
 \r
 Section "OCaml Libvirt bindings (for developers only)"\r
 SectionEnd\r
 \r
 Section "OCaml Libvirt bindings (for developers only)"\r


@@ -97,12 +97,12 @@ Section "Start Menu Shortcuts"
        CreateDirectory "$SMPROGRAMS\${PACKAGE}"\r
        CreateShortCut "$SMPROGRAMS\${PACKAGE}\Uninstall.lnk" "$INSTDIR\Uninstall ${PACKAGE}.exe" "" "$INSTDIR\Uninstall ${PACKAGE}.exe" 0\r
        CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0\r
        CreateDirectory "$SMPROGRAMS\${PACKAGE}"\r
        CreateShortCut "$SMPROGRAMS\${PACKAGE}\Uninstall.lnk" "$INSTDIR\Uninstall ${PACKAGE}.exe" "" "$INSTDIR\Uninstall ${PACKAGE}.exe" 0\r
        CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0\r

-       CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Control.lnk" "$INSTDIR\mlvirtmanager.exe" "" "$INSTDIR\mlvirtmanager.exe" 0\r
+       CreateShortCut "$SMPROGRAMS\${PACKAGE}\Virt Control.lnk" "$INSTDIR\virt-ctrlr.exe" "" "$INSTDIR\virt-ctrl.exe" 0\r

 SectionEnd\r
 \r
 Section "Desktop Icons"\r
        CreateShortCut "$DESKTOP\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0\r
 SectionEnd\r
 \r
 Section "Desktop Icons"\r
        CreateShortCut "$DESKTOP\Virt Shell.lnk" "$INSTDIR\mlvirsh.exe" "" "$INSTDIR\mlvirsh.exe" 0\r

-       CreateShortCut "$DESKTOP\Virt Control.lnk" "$INSTDIR\mlvirtmanager.exe" "" "$INSTDIR\mlvirtmanager.exe" 0\r
+       CreateShortCut "$DESKTOP\Virt Control.lnk" "$INSTDIR\virt-ctrl.exe" "" "$INSTDIR\virt-ctrl.exe" 0\r

 SectionEnd\r
 \r
 Section "Uninstall"\r
 SectionEnd\r
 \r
 Section "Uninstall"\r