From: Phil Pennock <pdp@exim.org>
Date: Thu, 3 Oct 2013 18:50:09 +0000 (-0400)
Subject: Unbreak HTML build for RC candidates.
X-Git-Tag: exim-4_82_RC3~15^2
X-Git-Url: https://git.exim.org/users/heiko/exim.git/commitdiff_plain/39d16d738122fd008efb87326058dd34cfa6ff1e

Unbreak HTML build for RC candidates.

The HTML build now uses the website repo, which extracts the version
number from the XML (generated from the .xfpt).  Meanwhile, commit
2aee48d6 made the version number in the build process dynamic, taking
the value from the release script (via an environ variable).

This change fixes the invocation to pass the version _without_ an RC
suffix to the XML build, letting HTML generation happen.
---

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index d29770d27..395cdd2b0 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -191,7 +191,8 @@ sub build_documentation {
     my $context = shift;
 
     my $docdir = File::Spec->catdir( $context->{release_tree}, 'doc', 'doc-docbook' );
-    system("cd '$docdir' && ./OS-Fixups && make EXIM_VER=$context->{release} everything") == 0
+    # documentation building gets the truncated release, without RC
+    system("cd '$docdir' && ./OS-Fixups && make EXIM_VER=$context->{trelease} everything") == 0
       || croak "Doc build failed";
 
     copy_docbook_files($context);