X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_upstream.ml;h=ad46864de4d12bc23f0c0b1f728bbc113261f91f;hb=b83fee0aa61ed1e51cf404be3af977fc3f8ffe19;hp=87d9741daee03b5e5cb6e3248c57b8b9e34f1bae;hpb=c9cc06f267344fad841e4f2ffa78225bf25bc95f;p=goaljobs-goals.git

diff --git a/libguestfs_upstream.ml b/libguestfs_upstream.ml
index 87d9741..ad46864 100644
--- a/libguestfs_upstream.ml
+++ b/libguestfs_upstream.ml
@@ -91,16 +91,13 @@ and website_built version =
     chmod +x localconfigure
     echo %s > localenv
 
-    # Copy in the builder/website templates.
-    cp -a $HOME/d/libguestfs/builder/website/*.xz builder/website/
-
     ./localconfigure
-    make
+    make V=1
     make website WEBSITEDIR=%s
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv (supermin version)))
     (quote libguestfs_website_repo)
 
 (* Goal: the tarball has passed the required set of tests before
@@ -122,12 +119,12 @@ and tarball_tested version =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " buildtmp version.tarball
     version.package_version
     (quote (libguestfs_localconfigure `Tarball))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv (supermin version)))
 
 (* Goal: the tarball has been created from git. *)
 and tarball_created version =
@@ -148,13 +145,19 @@ and tarball_created version =
     echo %s > localenv
 
     ./localconfigure
-    make
+
+    # Ensure the po-docs are updated.  Grrr this is ugly ...
+    make ||:
+    rm po-docs/podfiles
+    make -C po-docs update-po
+
+    make V=1
     make dist
     mv %s %s/tarballs/%s
   " repodir
     version.version
     (quote (libguestfs_localconfigure `Git))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv (supermin version)))
     version.tarball buildtmp version.tarball
 
 (* Goal: test a commit. *)
@@ -183,12 +186,12 @@ and commit_tested branch commit =
     echo %s > localenv
 
     ./localconfigure
-    make
+    make V=1
     make check-release
   " repodir
     commit
     (quote (libguestfs_localconfigure `Git))
-    (quote libguestfs_localenv)
+    (quote (libguestfs_localenv None))
 
 and repo_up_to_date branch =
   git_force branch