[pve-devel] [PATCH docs] doc-generator: synopsis: add parent directory to include path

[Dietmar Maurer]

Please install pve-doc-generator from staging repo,
or copy the missing file manually.

# cp PVE/CLI/pvesh.pm /usr/share/perl5/PVE/CLI/

> On July 27, 2018 at 12:04 PM Thomas Lamprecht <t.lamprecht at proxmox.com> wrote:
> 
> 
> Am 07/27/2018 um 11:59 AM schrieb Dietmar Maurer:
> > Not sure why we need/want that?
> > 
> 
> because, as written below, I get a build error in manager:
> 
> cp /usr/share/pve-doc-generator/pvesh.adoc pvesh.adoc.tmp
> mv pvesh.adoc.tmp pvesh.adoc
> PVE_GENERATING_DOCS=1 perl -I. -e "use PVE::CLI::pvesh;print 
> PVE::CLI::pvesh->generate_asciidoc_synopsis();" > pvesh.1-synopsis.adoc.tmp
> Can't locate PVE/CLI/pvesh.pm in @INC (you may need to install the 
> PVE::CLI::pvesh module) (@INC contains: . /etc/perl 
> /usr/local/lib/x86_64-linux-gnu/perl/5.24.1 /usr/local/share/perl/5.24.1 
> /usr/lib/x86_64-linux-gnu/perl5/5.24 /usr/share/perl5 
> /usr/lib/x86_64-linux-gnu/perl/5.24 /usr/share/perl/5.24 
> /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base .) at -e 
> line 1.
> ^^^^^^^^
> BEGIN failed--compilation aborted at -e line 1.
> /usr/share/pve-doc-generator/pve-doc-generator.mk:33: recipe for target 
> 'pvesh.1-synopsis.adoc' failed
> make[3]: *** [pvesh.1-synopsis.adoc] Error 2
> make[3]: Leaving directory '/root/sources/pve/pve-manager/dest/bin'
> Makefile:42: recipe for target 'install' failed
> make[2]: *** [install] Error 2
> make[2]: Leaving directory '/root/sources/pve/pve-manager/dest'
> dh_auto_install: make -j1 install 
> DESTDIR=/root/sources/pve/pve-manager/dest/debian/pve-manager 
> AM_UPDATE_INFO_DIR=no returned exit code 2
> debian/rules:13: recipe for target 'binary' failed
> make[1]: *** [binary] Error 2
> make[1]: Leaving directory '/root/sources/pve/pve-manager/dest'
> dpkg-buildpackage: error: debian/rules binary gave error exit status 2
> Makefile:26: recipe for target 'pve-manager_5.2-6_amd64.deb' failed
> make: *** [pve-manager_5.2-6_amd64.deb] Error 2
> 
> I installed latest docs and common, and pulled manager just yet (again, 
> to be sure), does it just fails here because I overlook something?
> 
> > 
> >> On July 27, 2018 at 11:48 AM Thomas Lamprecht <t.lamprecht at proxmox.com>
> >> wrote:
> >>
> >>
> >> As often the wanted PVE directory is one level higher.
> >>
> >> Add it after the current direcotry so that the current one always has
> >> precedence over its parent.
> >>
> >> Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
> >> ---
> >>
> >> * fixes a build error with pve-manager here where the pvesh docs couldn't
> >> be
> >> build
> >>
> >>   pve-doc-generator.mk.in | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/pve-doc-generator.mk.in b/pve-doc-generator.mk.in
> >> index ddc0217..53291ab 100644
> >> --- a/pve-doc-generator.mk.in
> >> +++ b/pve-doc-generator.mk.in
> >> @@ -30,11 +30,11 @@ pveperf.1-synopsis.adoc:
> >>   	echo '*pveperf* `[PATH]`' > pveperf.1-synopsis.adoc
> >>   
> >>   %.1-synopsis.adoc:
> >> -	$(PERL_DOC_ENV) perl -I. -e "use PVE::CLI::$(subst -,_,$*);print
> >> PVE::CLI::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
> >> +	$(PERL_DOC_ENV) perl -I. -I.. -e "use PVE::CLI::$(subst -,_,$*);print
> >> PVE::CLI::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
> >>   	mv $@.tmp $@
> >>   
> >>   %.8-synopsis.adoc:
> >> -	$(PERL_DOC_ENV) perl -I. -e "use PVE::Service::$(subst -,_,$*);print
> >> PVE::Service::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
> >> +	$(PERL_DOC_ENV) perl -I. -I.. -e "use PVE::Service::$(subst -,_,$*);print
> >> PVE::Service::$(subst -,_,$*)->generate_asciidoc_synopsis();" > $@.tmp
> >>   	mv $@.tmp $@
> >>   
> >>   ifneq (${DGDIR},.)
> >> -- 
> >> 2.18.0
> >>
> >>
> >> _______________________________________________
> >> pve-devel mailing list
> >> pve-devel at pve.proxmox.com
> >> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>