Re: podlators 4.05 released

2016-02-01 Thread Craig A. Berry
On Sat, Jan 30, 2016 at 3:29 PM, Russ Allbery  wrote:

> Just so that I can add a comment to explain why this is here, to keep
> myself from deleting it five years later because it seems unnecessary,
> could you provide a bit of background on:
>
>> +delete $metadata{MAN1PODS} if $ENV{PERL_CORE};
>
> Is there some other method used to generate the man pages for core that
> doesn't want to do this from Makefile.PL?

The background is that the core build blows up like so with that entry in place:

Generating a Unix-style Makefile
Writing Makefile for Pod
"../../miniperl" "-I../../lib" "-I../../lib" "-I../../lib"
"-I../../lib" scripts/pod2text.PL scripts/pod2text
Extracting pod2text (with variable substitutions)
cp scripts/pod2text blib/script/pod2text
/Users/craig/perlrep/perl/cpan/podlators/../../miniperl "-I../../lib"
"-I../../lib" -MExtUtils::MY -e 'MY->fixin(shift)' --
blib/script/pod2text
"../../miniperl" "-I../../lib" "-I../../lib" "-I../../lib"
"-I../../lib" scripts/pod2man.PL scripts/pod2man
Extracting pod2man (with variable substitutions)
cp scripts/pod2man blib/script/pod2man
/Users/craig/perlrep/perl/cpan/podlators/../../miniperl "-I../../lib"
"-I../../lib" -MExtUtils::MY -e 'MY->fixin(shift)' --
blib/script/pod2man
make[1]: *** No rule to make target `pod/perlpodstyle', needed by
`manifypods'.  Stop.
make[1]: *** No rule to make target `pod/perlpodstyle', needed by
`manifypods'.  Stop.
Unsuccessful make(cpan/podlators): code=512 at make_ext.pl line 569.
make: *** [cpan/podlators/pm_to_blib] Error 25

so I copied what Pod::Perldoc does, the only other module in core that
passes MAN1PODS to MakeMaker.

But it looks like I entirely missed the pod/ directory in your
distribution, and I now note that we have a (presumably out-of-date)
perlpodstyle.pod in the top-level pod/ directory.  Don't know why, but
core--cpan-diff (the tool we use to compare dual-life modules with
upstream) didn't add cpan/podlators/pod when I used it to generate a
patch.  Probably pilot error of some sort.

So bear with me a bit longer while I get this sorted out.


Re: podlators 4.05 released

2016-02-01 Thread Craig A. Berry
On Sat, Jan 30, 2016 at 6:37 PM, Russ Allbery  wrote:
> "Craig A. Berry"  writes:
>
>> But it looks like I entirely missed the pod/ directory in your
>> distribution,

>> So bear with me a bit longer while I get this sorted out.
>
> I suspect that renaming perlpodstyle back to perlpodstyle.pod will help
> considerably.  I removed the *.pod suffix to work around problems with
> Module::Build, and it shouldn't be necessary now that the package is only
> using ExtUtils::MakeMaker again.

The missing .pod extension did confuse me.  Whether it confused the
tools or I did something else wrong I'm not sure.  But I think / hope
I have it sorted out with:

http://perl5.git.perl.org/perl.git/commitdiff/259f5e0bbc6277b397458cb905d37baaa68aaada

There was a comment in Porting/Maintainers.pl, the file we use to keep
track of dual-life modules, that perlpodstyle is special and lives in
the top-level pod/ directory in core. I don't know why it's there or
whether it really needs to be there, but I left it for now.  It will
get manified with all of the other .pod files in that directory.  And
it was already up-to-date.

So you have two differences from core now, one being that
pod/perlpodstyle  upstream maps to pod/perlpodstyle.pod in core (*not*
cpan/podlators/pod/...), and the other being the minor tweaks to
Makefile.PL, that now look like the following.  You can probably just
apply this with -p2.

--- 
/private/var/folders/gb/9qzz8hdm8xjf6c00r6_l9z00gp/T/M7vJQyIBxQ/untarred/podlators-4.05/Makefile.PL
2016-01-16 16:17:56.0 -0600
+++ cpan/podlators/Makefile.PL 2016-01-30 18:29:35.0 -0600
@@ -26,7 +26,9 @@
 #  (Scalar) Space-separated relative paths from top of distribution
 sub scripts {
 my (@scripts) = @_;
-my @paths = map { File::Spec->catfile('scripts', $_) } @scripts;
+my $script_ext = $^O eq 'VMS' ? '.com' : '';
+my @paths = map { $_ .= $script_ext unless $_ =~ m/\.PL$/i;
+  File::Spec->catfile('scripts', $_) } @scripts;
 return wantarray ? @paths : join(q{ }, @paths);
 }

@@ -74,7 +76,8 @@
 MAN1PODS => {
 man1pod('scripts', 'pod2man'),
 man1pod('scripts', 'pod2text'),
-man1pod('pod', 'perlpodstyle'),
+# This one lives in the top-level pod/ directory in core
+($ENV{PERL_CORE} ? () : man1pod('pod', 'perlpodstyle')),
 },

 # Clean some additional files.
[end]


Re: podlators 4.05 released

2016-01-31 Thread Russ Allbery
"Craig A. Berry"  writes:

> The missing .pod extension did confuse me.  Whether it confused the
> tools or I did something else wrong I'm not sure.  But I think / hope I
> have it sorted out with:

> http://perl5.git.perl.org/perl.git/commitdiff/259f5e0bbc6277b397458cb905d37baaa68aaada

Thanks!  I'm actually going to rename it back to perlpodstyle.pod in the
next release, though (hopefully this weekend), because the renaming was
just to work around a Module::Build issue and I'd rather it have the same
extension as a normal POD file.  Just need to make sure that
ExtUtils::MakeMaker doesn't pick it up and try to install it as a module
man page, which was the issue with Module::Build.

> There was a comment in Porting/Maintainers.pl, the file we use to keep
> track of dual-life modules, that perlpodstyle is special and lives in
> the top-level pod/ directory in core. I don't know why it's there or
> whether it really needs to be there, but I left it for now.  It will get
> manified with all of the other .pod files in that directory.  And it was
> already up-to-date.

If it's identical, I'd kind of rather have it come directly from the
package in the cpan directory, since I'm happy to maintain it, but I have
no strong opinion there.  Y'all should do whatever is easier for you.  :)

> So you have two differences from core now, one being that
> pod/perlpodstyle upstream maps to pod/perlpodstyle.pod in core (*not*
> cpan/podlators/pod/...), and the other being the minor tweaks to
> Makefile.PL, that now look like the following.  You can probably just
> apply this with -p2.

Thanks!  I'll apply this, fix the naming of the file, and put out another
release.

-- 
#!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker
$^=q;@!>~|{>krw>yn{u<$$<[~|| 0gFzD gD,
 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{
rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print


Re: podlators 4.05 released

2016-01-30 Thread Russ Allbery
"Craig A. Berry"  writes:

> Thanks, Russ.  I've managed to integrate this into core:

> 

> The only thing different now between core and upstream is the
> Makefile.PL.  I've attached a patch to make it the same upstream (just
> two little nits needed for core). Hopefully with so few differences now,
> future integrations will be easy (this one was anything but!).

Beatiful, thank you!  And thank you for all the integration work.

Just so that I can add a comment to explain why this is here, to keep
myself from deleting it five years later because it seems unnecessary,
could you provide a bit of background on:

> +delete $metadata{MAN1PODS} if $ENV{PERL_CORE};

Is there some other method used to generate the man pages for core that
doesn't want to do this from Makefile.PL?

-- 
#!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker
$^=q;@!>~|{>krw>yn{u<$$<[~|| 0gFzD gD,
 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{
rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print


Re: podlators 4.05 released

2016-01-30 Thread Russ Allbery
"Craig A. Berry"  writes:

> But it looks like I entirely missed the pod/ directory in your
> distribution, and I now note that we have a (presumably out-of-date)
> perlpodstyle.pod in the top-level pod/ directory.  Don't know why, but
> core--cpan-diff (the tool we use to compare dual-life modules with
> upstream) didn't add cpan/podlators/pod when I used it to generate a
> patch.  Probably pilot error of some sort.

> So bear with me a bit longer while I get this sorted out.

I suspect that renaming perlpodstyle back to perlpodstyle.pod will help
considerably.  I removed the *.pod suffix to work around problems with
Module::Build, and it shouldn't be necessary now that the package is only
using ExtUtils::MakeMaker again.

-- 
#!/usr/bin/perl -- Russ Allbery, Just Another Perl Hacker
$^=q;@!>~|{>krw>yn{u<$$<[~|| 0gFzD gD,
 00Fz, 0,,( 0hF 0g)F/=, 0> "L$/GEIFewe{,$/ 0C$~> "@=,m,|,(e 0.), 01,pnn,y{
rw} >;,$0=q,$,,($_=$^)=~y,$/ C-~><@=\n\r,-~$:-u/ #y,d,s,(\$.),$1,gee,print


Re: podlators 4.05 released

2016-01-18 Thread Ricardo Signes
* Russ Allbery  [2016-01-16T17:36:02]
> I'm pleased to announce release 4.05 of podlators.

Thanks, Russ!  I can only assume that moving back to the *.PL was a bit of a
disappointment.  Thanks for helping to keep things great on all platforms!

-- 
rjbs


signature.asc
Description: Digital signature