X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/8f29c95072dea6fbd8476afa3c990de62b40fafd..0761d44e:/release-process/scripts/mk_exim_release.pl

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index f062baba5..610933549 100755
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -9,6 +9,7 @@ use File::Copy;
 use File::Spec;
 use File::Path;
 use File::Temp;
+use FindBin;
 use Getopt::Long;
 use Pod::Usage;
 
@@ -19,13 +20,19 @@ my $verbose = 0;
 
 sub get_and_check_version {
     my $release = shift;
+    my $context = shift;
 
     # make sure this looks like a real release version
     # which should (currently) be 4.xx or 4.xx_RCx
     unless ( $release =~ /^(4\.\d\d(?:_RC\d+)?)$/ ) {
         croak "The given version number does not look right - $release";
     }
-    return $1;    # untainted here...
+    my $full_release  = $1;              # untainted here...
+    my $trunc_release = $full_release;
+    $trunc_release =~ s/^(4\.\d\d)(?:_RC\d+)?$/$1/;
+
+    $context->{release}  = $full_release;
+    $context->{trelease} = $trunc_release;
 }
 
 # ------------------------------------------------------------------
@@ -95,9 +102,36 @@ sub unpack_tree {
 
 # ------------------------------------------------------------------
 
+sub build_html_documentation {
+    my $context = shift;
+
+    my $genpath   = $context->{webgen_base} . '/script/gen.pl';
+    my $templates = $context->{webgen_base} . '/templates';
+    my $dir       = 'html';
+    mkdir($dir);
+
+    my @cmd = (
+        $genpath,                     '--spec',    'doc/doc-docbook/spec.xml', '--filter',
+        'doc/doc-docbook/filter.xml', '--latest',  $context->{trelease},       '--tmpl',
+        $templates,                   '--docroot', $dir
+    );
+
+    print "Executing ", join( ' ', @cmd ), "\n";
+    system(@cmd);
+
+    # move directory into right place
+    rename( sprintf( 'html/exim-html-%s', $context->{trelease} ), sprintf( 'exim-html-%s', $context->{release} ) );
+}
+
+# ------------------------------------------------------------------
+
 sub build_documentation {
+    my $context = shift;
+
     system("cd doc/doc-docbook && ./OS-Fixups && make everything") == 0
       || croak "Doc build failed";
+
+    build_html_documentation($context);
 }
 
 # ------------------------------------------------------------------
@@ -160,23 +194,6 @@ sub build_pspdfinfo_directory {
 
 # ------------------------------------------------------------------
 
-sub build_html_directory {
-    my $context = shift;
-
-    my $dir = sprintf( 'exim-%s-%s', 'html', $context->{release} );
-    my $target = File::Spec->catdir( $dir, 'doc', 'html' );
-    mkpath( $target, { verbose => ( $verbose || $debug ) } );
-
-    # move documents across
-    move( File::Spec->catdir( 'doc/doc-docbook', 'spec_html' ), File::Spec->catdir( $target, 'spec_html' ) );
-    foreach my $file ( glob( File::Spec->catfile( 'doc/doc-docbook', '*.html' ) ) ) {
-        my $fn = ( File::Spec->splitpath($file) )[2];
-        move( $file, File::Spec->catfile( $target, $fn ) );
-    }
-}
-
-# ------------------------------------------------------------------
-
 sub build_main_package_directory {
     my $context = shift;
 
@@ -200,7 +217,6 @@ sub build_package_directories {
 
     build_main_package_directory($context);
     build_pspdfinfo_directory($context);
-    build_html_directory($context);
 }
 
 # ------------------------------------------------------------------
@@ -219,21 +235,23 @@ sub create_tar_files {
     my $man;
     my $help;
     my $context = {
-        pkgname  => 'exim',
-        orig_dir => File::Spec->curdir(),
-        tmp_dir  => File::Temp->newdir(),
+        pkgname     => 'exim',
+        orig_dir    => File::Spec->curdir(),
+        tmp_dir     => File::Temp->newdir(),
+        webgen_base => "$FindBin::Bin/../../../exim-website",
     };
     my $delete;
     ##$ENV{'PATH'} = '/opt/local/bin:' . $ENV{'PATH'};
 
     unless (
         GetOptions(
-            'directory=s' => \$context->{directory},
-            'verbose!'    => \$verbose,
-            'debug!'      => \$debug,
-            'help|?'      => \$help,
-            'man!'        => \$man,
-            'delete!'     => \$delete,
+            'directory=s'   => \$context->{directory},
+            'webgen_base=s' => \$context->{webgen_base},
+            'verbose!'      => \$verbose,
+            'debug!'        => \$debug,
+            'help|?'        => \$help,
+            'man!'          => \$man,
+            'delete!'       => \$delete,
         )
       )
     {
@@ -242,8 +260,8 @@ sub create_tar_files {
     pod2usage(0) if $help;
     pod2usage( -verbose => 2 ) if $man;
 
-    $context->{release} = get_and_check_version(shift);
-    $context->{tag}     = build_tag($context);
+    get_and_check_version( shift, $context );
+    $context->{tag} = build_tag($context);
     deal_with_working_directory( $context, $delete );
     export_git_tree($context);
     chdir( $context->{directory} ) || die;