Adjust for new layout of the libguestfs website.

diff --git a/config.ml b/config.ml
index 80f116b..25316f7 100644 (file)
--- a/config.ml
+++ b/config.ml
@@ -17,8 +17,14 @@ let fedora_specfile pkg branch =
 (* libguestfs *)
 let libguestfs_query_mins = 60
 
+let websites_repo =
+  sprintf "%s/d/websites" (Sys.getenv "HOME")
 let libguestfs_website_repo =
-  sprintf "%s/d/websites/libguestfs" (Sys.getenv "HOME")
+  sprintf "%s/libguestfs" websites_repo
+let libguestfs_builder_repo =
+  sprintf "%s/libguestfs-builder" websites_repo
+let libguestfs_download_repo =
+  sprintf "%s/libguestfs-download" websites_repo
 
 let libguestfs_localconfigure source =
   let configure =

diff --git a/libguestfs.ml b/libguestfs.ml
index 48da3ea..5cb806b 100644 (file)
--- a/libguestfs.ml
+++ b/libguestfs.ml
@@ -20,8 +20,8 @@ type info = {
   package_version : string;      (* package-version *)
   tarball : string;              (* package-version.tar.gz *)
   python_tarball : string;       (* guestfs-version.tar.gz *)
-  urlpath : string;              (* download/1.X-(stable|development)/tarball *)
-  python_urlpath : string;       (* download/python/python_tarball *)
+  urlpath : string;              (* libguestfs-download/1.X-(stable|development)/tarball *)
+  python_urlpath : string;       (* libguestfs-download/python/python_tarball *)
   url : string;                  (* full download URL of tarball *)
   python_url : string;           (* python sdist *)
 }
@@ -48,14 +48,14 @@ let vernames version =
       let tarball = sprintf "%s.tar.gz" package_version in
       let urlpath =
         if is_stable then
-          sprintf "download/%d.%d-stable/%s" major minor tarball
+          sprintf "%d.%d-stable/%s" major minor tarball
         else
-          sprintf "download/%d.%d-development/%s" major minor tarball in
-      let url = "http://libguestfs.org/" ^ urlpath in
+          sprintf "%d.%d-development/%s" major minor tarball in
+      let url = "http://download.libguestfs.org/" ^ urlpath in
       let python_tarball =
         sprintf "guestfs-%d.%d.%d.tar.gz" major minor release in
-      let python_urlpath = sprintf "download/python/" ^ python_tarball in
-      let python_url = "http://libguestfs.org/" ^ python_urlpath in
+      let python_urlpath = sprintf "python/" ^ python_tarball in
+      let python_url = "http://download.libguestfs.org/" ^ python_urlpath in
 
       { version = version;
         major = major; minor = minor; release = release;
@@ -130,7 +130,7 @@ let git_latest_commit branch =
 let website_latest_version =
   let rex = Str.regexp "libguestfs-\\(.*\\)\\.tar\\.gz" in
   fun branch ->
-    let wdir = libguestfs_website_repo // "download" // branch in
+    let wdir = libguestfs_download_repo // branch in
     let files = Sys.readdir wdir in
     let files = Array.to_list files in
     if files = [] then None

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index 3d9ba21..1dcb476 100644 (file)
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -66,7 +66,7 @@ and sources_uploaded version branch =
   sh "
     cd %s
     fedpkg new-sources %s/%s
-  " repodir libguestfs_website_repo version.urlpath
+  " repodir libguestfs_download_repo version.urlpath
 
 and specfile_updated version branch =
   let repodir = fedora_repo package branch in

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 5b86e04..b1daa19 100644 (file)
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -62,7 +62,7 @@ and website_rsync_done version =
   sh "
     cd %s
     ./.rsync
-  " libguestfs_website_repo
+  " websites_repo
 
 (* Goal: Tarball added to repository and checked in. *)
 and website_checked_in version =
@@ -77,11 +77,15 @@ and website_checked_in version =
     cd %s
     cp %s/tarballs/%s %s
     git add %s
+    cd %s
     git add *.txt *.html
+    cd %s
     git commit -m \"Version %s\"
-  " libguestfs_website_repo
+  " libguestfs_download_repo
     buildtmp version.tarball version.urlpath
     version.urlpath
+    libguestfs_website_repo
+    websites_repo
     version.version
 
 (* Goal: website (local copy) has been built. *)
@@ -105,12 +109,12 @@ and website_built version =
 
     ./localconfigure
     make V=1
-    make maintainer-upload-website WEBSITEDIR=%s
+    make maintainer-upload-website WEBSITESDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
     (quote (libguestfs_localenv (supermin version)))
-    (quote libguestfs_website_repo)
+    (quote websites_repo)
 
 (* Goal: the tarball has passed the required set of tests before
  * a release is allowed.
@@ -235,7 +239,7 @@ and python_website_checked_in version =
     cp %s/tarballs/%s %s
     git add %s
     git commit -m \"Python sdist version %s\"
-  " libguestfs_website_repo
+  " libguestfs_download_repo
     buildtmp version.python_tarball version.python_urlpath
     version.python_urlpath
     version.version