Use installed goaljobs package.

[goaljobs-goals.git] / libguestfs.ml

diff --git a/libguestfs.ml b/libguestfs.ml
index e265608..508cbeb 100644 (file)
--- a/libguestfs.ml
+++ b/libguestfs.ml
@@ -59,6 +59,14 @@ let vernames version =
         url = url }
   )
 
+(* For libguestfs <= 1.24, we need an old supermin 4 binary. *)
+let supermin = function
+  | { major = 1; minor = i } when i <= 24 ->
+    let home = Sys.getenv "HOME" in
+    Some ( home // "d/supermin4/src/supermin",
+           home // "d/supermin4/helper/supermin-helper" )
+  | _ -> None
+
 (* Clone or update a repo to the latest version on a branch, by force.
  * It is cached in name = $buildtmp/repos/<package>-<branch>
  *)
@@ -86,6 +94,15 @@ let git_latest_version branch =
     cd %s/repos/%s-%s
     git describe --tags --abbrev=0
   " buildtmp package (quote branch) in
+  (* Branches <= 1.32 are tagged with "1.32.11",
+   * branches >= 1.33 are tagged with "v1.33.11".
+   *)
+  let len = String.length v in
+  let v =
+    if len > 0 && v.[0] = 'v' then
+      String.sub v 1 (len-1)
+    else
+      v in
   vernames v
 
 (* Get the latest commit. *)
@@ -102,7 +119,7 @@ let git_latest_commit branch =
 let website_latest_version =
   let rex = Str.regexp "libguestfs-\\(.*\\)\\.tar\\.gz" in
   fun branch ->
-    let wdir = libguestfs_website_cvs // "download" // branch in
+    let wdir = libguestfs_website_repo // "download" // branch in
     let files = Sys.readdir wdir in
     let files = Array.to_list files in
     if files = [] then None