libguestfs: fedora: F20 is being built by hand at the moment.

[goaljobs-goals.git] / libguestfs_upstream.ml

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 215772c..87d9741 100644 (file)
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -39,7 +39,7 @@ let rec goal website_updated version =
   if not version.is_stable then
     require (website_built version);
 
-  require (website_cvs_checked_in version);
+  require (website_checked_in version);
   require (website_rsync_done version)
 
 (* Goal: website has been rsync'd. *)
@@ -50,11 +50,11 @@ and website_rsync_done version =
   sh "
     cd %s
     ./.rsync
-  " libguestfs_website_cvs
+  " libguestfs_website_repo
 
-(* Goal: Tarball added to CVS and CVS checked in. *)
-and website_cvs_checked_in version =
-  let key = sprintf "libguestfs_website_cvs_checked_in_%s" version.version in
+(* Goal: Tarball added to repository and checked in. *)
+and website_checked_in version =
+  let key = sprintf "libguestfs_website_checked_in_%s" version.version in
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");
 
@@ -64,16 +64,17 @@ and website_cvs_checked_in version =
   sh "
     cd %s
     cp %s/tarballs/%s %s
-    cvs add -kb %s
-    cvs ci -m \"Version %s\"
-  " libguestfs_website_cvs
+    git add %s
+    git add *.txt *.html
+    git commit -m \"Version %s\"
+  " libguestfs_website_repo
     buildtmp version.tarball version.urlpath
     version.urlpath
     version.version
 
 (* Goal: website (local copy) has been built. *)
 and website_built version =
-  let index_file = sprintf "%s/index.html" libguestfs_website_cvs in
+  let index_file = sprintf "%s/index.html" libguestfs_website_repo in
   target (file_contains_string index_file version.version);
 
   require (tarball_created version);
@@ -95,11 +96,12 @@ and website_built version =
 
     ./localconfigure
     make
-    make website
+    make website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
     (quote libguestfs_localenv)
+    (quote libguestfs_website_repo)
 
 (* Goal: the tarball has passed the required set of tests before
  * a release is allowed.