Move B-Deparse from dist/ to lib/ since it is non-dual-lived and pure-Perl

diff --git a/MANIFEST b/MANIFEST
index 5fcd5db..6e4599c 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2837,9 +2837,6 @@ dist/base/t/lib/HasSigDie.pm      Module for testing base.pm
 dist/base/t/sigdie.t           See if base works with SIGDIE
 dist/base/t/version.t          See if base works with versions
 dist/base/t/warnings.t         See if base works with warnings
-dist/B-Deparse/Deparse.pm      Compiler Deparse backend
-dist/B-Deparse/t/core.t                See if B::Deparse knows when to use CORE::
-dist/B-Deparse/t/deparse.t     See if B::Deparse works
 dist/bignum/lib/bigint.pm              bigint
 dist/bignum/lib/bignum.pm              bignum
 dist/bignum/lib/bigrat.pm              bigrat
@@ -4049,6 +4046,9 @@ keywords.h                        The keyword numbers
 l1_char_class_tab.h            256 word bit table of character classes (for handy.h)
 lib/AnyDBM_File.pm             Perl module to emulate dbmopen
 lib/AnyDBM_File.t              See if AnyDBM_File works
+lib/B/Deparse-core.t           See if B::Deparse knows when to use CORE::
+lib/B/Deparse.pm               Compiler Deparse backend
+lib/B/Deparse.t                        See if B::Deparse works
 lib/Benchmark.pm               Measure execution time
 lib/Benchmark.t                        See if Benchmark works
 lib/blib.pm                    For "use blib"

diff --git a/Makefile.SH b/Makefile.SH
index 53bb102..9d7a125 100755 (executable)
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1272,10 +1272,9 @@ _cleaner2:
        -rmdir lib/Encode lib/Digest lib/Devel lib/Data lib/Config/Perl
        -rmdir lib/Compress/Raw lib/Compress lib/Carp lib/CPAN/Meta
        -rmdir lib/CPAN/LWP lib/CPAN/Kwalify lib/CPAN/HTTP lib/CPAN/FTP
-       -rmdir lib/CPAN/Exception lib/CPAN/API lib/CPAN lib/CGI lib/B
-       -rmdir lib/Attribute lib/Archive/Tar lib/Archive
-       -rmdir lib/App/Prove/State/Result lib/App/Prove/State lib/App/Prove
-       -rmdir lib/App
+       -rmdir lib/CPAN/Exception lib/CPAN/API lib/CPAN lib/CGI lib/Attribute
+       -rmdir lib/Archive/Tar lib/Archive lib/App/Prove/State/Result
+       -rmdir lib/App/Prove/State lib/App/Prove lib/App
 
 _realcleaner:
        @$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=distclean

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8675516..2c37a9f 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -189,10 +189,6 @@ use File::Glob qw(:case);
         'EXCLUDED'     => ['t/pod.t'],
     },
 
-    'B::Deparse' => {
-        'FILES'      => q[dist/B-Deparse],
-    },
-
     'base' => {
         'DISTRIBUTION' => 'RGARCIA/base-2.18.tar.gz',
         'FILES'        => q[dist/base],
@@ -1410,6 +1406,7 @@ use File::Glob qw(:case);
                 ext/re/
                 lib/AnyDBM_File.{pm,t}
                 lib/Benchmark.{pm,t}
+                lib/B/Deparse{.pm,.t,-core.t}
                 lib/CORE.pod
                 lib/Class/Struct.{pm,t}
                 lib/Config.t

diff --git a/lib/.gitignore b/lib/.gitignore
index 8337da0..547c5e8 100644 (file)
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -14,7 +14,11 @@
 /AutoLoader.pm
 /AutoSplit.pm
 /B.pm
-/B/
+/B/Concise.pm
+/B/Debug.pm
+/B/Showlex.pm
+/B/Terse.pm
+/B/Xref.pm
 /CGI.pm
 /CGI/
 /CPAN.pm

diff --git a/dist/B-Deparse/t/core.t b/lib/B/Deparse-core.t
similarity index 99%
rename from dist/B-Deparse/t/core.t
rename to lib/B/Deparse-core.t
index 58540f8..eaa2689 100644 (file)
--- a/dist/B-Deparse/t/core.t
+++ b/lib/B/Deparse-core.t
@@ -338,7 +338,7 @@ SKIP:
 {
     skip "sanity checks when not PERL_CORE", 1 unless defined $ENV{PERL_CORE};
     my $count = 0;
-    my $file = '../../regen/keywords.pl';
+    my $file = '../regen/keywords.pl';
     my $pass = 1;
     if (open my $fh, '<', $file) {
        while (<$fh>) {

diff --git a/dist/B-Deparse/Deparse.pm b/lib/B/Deparse.pm
similarity index 100%
rename from dist/B-Deparse/Deparse.pm
rename to lib/B/Deparse.pm

diff --git a/dist/B-Deparse/t/deparse.t b/lib/B/Deparse.t
similarity index 100%
rename from dist/B-Deparse/t/deparse.t
rename to lib/B/Deparse.t

diff --git a/win32/Makefile b/win32/Makefile
index 55fd920..6931b2e 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1195,7 +1195,6 @@ distclean: realclean
        -if exist $(LIBDIR)\Archive rmdir /s /q $(LIBDIR)\Archive
        -if exist $(LIBDIR)\Attribute rmdir /s /q $(LIBDIR)\Attribute
        -if exist $(LIBDIR)\autodie rmdir /s /q $(LIBDIR)\autodie
-       -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
        -if exist $(LIBDIR)\Carp rmdir /s /q $(LIBDIR)\Carp
        -if exist $(LIBDIR)\CGI rmdir /s /q $(LIBDIR)\CGI
        -if exist $(LIBDIR)\Compress rmdir /s /q $(LIBDIR)\Compress

diff --git a/win32/makefile.mk b/win32/makefile.mk
index adac20e..6b7cd77 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1376,7 +1376,6 @@ distclean: realclean
        -if exist $(LIBDIR)\Archive rmdir /s /q $(LIBDIR)\Archive
        -if exist $(LIBDIR)\Attribute rmdir /s /q $(LIBDIR)\Attribute
        -if exist $(LIBDIR)\autodie rmdir /s /q $(LIBDIR)\autodie
-       -if exist $(LIBDIR)\B rmdir /s /q $(LIBDIR)\B
        -if exist $(LIBDIR)\Carp rmdir /s /q $(LIBDIR)\Carp
        -if exist $(LIBDIR)\CGI rmdir /s /q $(LIBDIR)\CGI
        -if exist $(LIBDIR)\Compress rmdir /s /q $(LIBDIR)\Compress