db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-06-29 00:21:56 +02:00
Code Issues Releases Activity

Use absolute paths so that ./doc.pl runs.

Browse Source 
The relative paths used would not correctly find required libraries and DTD files.
This commit is contained in:
David Steele
2018-12-12 13:48:31 -05:00
parent ee04ebe314
commit fdc76742c8
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/doc.pl
View File

@ -19,10 +19,10 @@ use Getopt::Long qw(GetOptions);
use Pod::Usage qw(pod2usage); use Pod::Usage qw(pod2usage);
use Storable; use Storable;
use lib dirname($0) . '/lib'; use lib dirname(abs_path($0)) . '/lib';
use lib dirname(dirname($0)) . '/lib'; use lib dirname(dirname(abs_path($0))) . '/lib';
use lib dirname(dirname($0)) . '/build/lib'; use lib dirname(dirname(abs_path($0))) . '/build/lib';
use lib dirname(dirname($0)) . '/test/lib'; use lib dirname(dirname(abs_path($0))) . '/test/lib';
use BackRestDoc::Common::Doc; use BackRestDoc::Common::Doc;
use BackRestDoc::Common::DocConfig; use BackRestDoc::Common::DocConfig;

4
doc/lib/BackRestDoc/Common/Doc.pm
View File

@ -8,6 +8,7 @@ use warnings FATAL => qw(all);
use Carp qw(confess); use Carp qw(confess);
use English '-no_match_vars'; use English '-no_match_vars';
use Cwd qw(abs_path);
use File::Basename qw(dirname); use File::Basename qw(dirname);
use Scalar::Util qw(blessed); use Scalar::Util qw(blessed);
use XML::Checker::Parser; use XML::Checker::Parser;
@ -45,7 +46,8 @@ sub new
if (defined($self->{strFileName})) if (defined($self->{strFileName}))
{ {
my $oParser = XML::Checker::Parser->new(ErrorContext => 2, Style => 'Tree'); my $oParser = XML::Checker::Parser->new(ErrorContext => 2, Style => 'Tree');
$oParser->set_sgml_search_path(defined($strSgmlSearchPath) ? $strSgmlSearchPath : dirname(dirname($0)) . '/doc/xml/dtd'); $oParser->set_sgml_search_path(
defined($strSgmlSearchPath) ? $strSgmlSearchPath : dirname(dirname(abs_path($0))) . '/doc/xml/dtd');
my $oTree; my $oTree;

4
doc/xml/release.xml
View File

@ -222,6 +222,10 @@
<p>Add Centos/RHEL 7 option to documentation build.</p> <p>Add Centos/RHEL 7 option to documentation build.</p>
</release-item> </release-item>
<release-item>
<p>Use absolute paths so that <file>./doc.pl</file> runs.</p>
</release-item>
<release-item> <release-item>
<p>Pick <code>pg_switch_wal()</code>/<code>pg_switch_xlog()</code> based on <postgres/> version.</p> <p>Pick <code>pg_switch_wal()</code>/<code>pg_switch_xlog()</code> based on <postgres/> version.</p>
</release-item> </release-item>