In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c46b5ef0fcde6b0f28e69b7703ea15847f873bd3?hp=6b10655d3ee68e96dae350f9c241e9e592f7c674>
- Log ----------------------------------------------------------------- commit c46b5ef0fcde6b0f28e69b7703ea15847f873bd3 Author: Tony Cook <[email protected]> Date: Tue Jan 13 16:28:15 2015 +1100 report which files have duplicates in porting/manifest.t M t/porting/manifest.t commit ac0e53cd2e68c3cd1b17197f1802e71896bf36aa Author: Ed J <[email protected]> Date: Mon Dec 29 11:59:40 2014 +0000 Simplify ext/SDBM_File layout and build Tony: fix MANIFEST M MANIFEST A ext/SDBM_File/.gitignore A ext/SDBM_File/CHANGES A ext/SDBM_File/COMPARE M ext/SDBM_File/Makefile.PL A ext/SDBM_File/README A ext/SDBM_File/README.too M ext/SDBM_File/SDBM_File.pm M ext/SDBM_File/SDBM_File.xs A ext/SDBM_File/biblio A ext/SDBM_File/dba.c A ext/SDBM_File/dbd.c A ext/SDBM_File/dbe.1 A ext/SDBM_File/dbe.c A ext/SDBM_File/dbu.c A ext/SDBM_File/grind A ext/SDBM_File/hash.c A ext/SDBM_File/linux.patches A ext/SDBM_File/makefile.sdbm A ext/SDBM_File/pair.c A ext/SDBM_File/pair.h A ext/SDBM_File/readme.ms A ext/SDBM_File/sdbm.3 A ext/SDBM_File/sdbm.c A ext/SDBM_File/sdbm.h D ext/SDBM_File/sdbm/.gitignore D ext/SDBM_File/sdbm/CHANGES D ext/SDBM_File/sdbm/COMPARE D ext/SDBM_File/sdbm/Makefile.PL D ext/SDBM_File/sdbm/README D ext/SDBM_File/sdbm/README.too D ext/SDBM_File/sdbm/biblio D ext/SDBM_File/sdbm/dba.c D ext/SDBM_File/sdbm/dbd.c D ext/SDBM_File/sdbm/dbe.1 D ext/SDBM_File/sdbm/dbe.c D ext/SDBM_File/sdbm/dbu.c D ext/SDBM_File/sdbm/grind D ext/SDBM_File/sdbm/hash.c D ext/SDBM_File/sdbm/linux.patches D ext/SDBM_File/sdbm/makefile.sdbm D ext/SDBM_File/sdbm/pair.c D ext/SDBM_File/sdbm/pair.h D ext/SDBM_File/sdbm/readme.ms D ext/SDBM_File/sdbm/sdbm.3 D ext/SDBM_File/sdbm/sdbm.c D ext/SDBM_File/sdbm/sdbm.h D ext/SDBM_File/sdbm/tune.h D ext/SDBM_File/sdbm/util.c A ext/SDBM_File/tune.h A ext/SDBM_File/util.c ----------------------------------------------------------------------- Summary of changes: MANIFEST | 45 ++++++++++---------- ext/SDBM_File/.gitignore | 2 + ext/SDBM_File/{sdbm => }/CHANGES | 0 ext/SDBM_File/{sdbm => }/COMPARE | 0 ext/SDBM_File/Makefile.PL | 75 ++++++---------------------------- ext/SDBM_File/{sdbm => }/README | 0 ext/SDBM_File/{sdbm => }/README.too | 0 ext/SDBM_File/SDBM_File.pm | 2 +- ext/SDBM_File/SDBM_File.xs | 2 +- ext/SDBM_File/{sdbm => }/biblio | 0 ext/SDBM_File/{sdbm => }/dba.c | 0 ext/SDBM_File/{sdbm => }/dbd.c | 0 ext/SDBM_File/{sdbm => }/dbe.1 | 0 ext/SDBM_File/{sdbm => }/dbe.c | 0 ext/SDBM_File/{sdbm => }/dbu.c | 0 ext/SDBM_File/{sdbm => }/grind | 0 ext/SDBM_File/{sdbm => }/hash.c | 0 ext/SDBM_File/{sdbm => }/linux.patches | 0 ext/SDBM_File/{sdbm => }/makefile.sdbm | 0 ext/SDBM_File/{sdbm => }/pair.c | 0 ext/SDBM_File/{sdbm => }/pair.h | 0 ext/SDBM_File/{sdbm => }/readme.ms | 0 ext/SDBM_File/{sdbm => }/sdbm.3 | 0 ext/SDBM_File/{sdbm => }/sdbm.c | 0 ext/SDBM_File/{sdbm => }/sdbm.h | 0 ext/SDBM_File/sdbm/.gitignore | 2 - ext/SDBM_File/sdbm/Makefile.PL | 48 ---------------------- ext/SDBM_File/{sdbm => }/tune.h | 0 ext/SDBM_File/{sdbm => }/util.c | 0 t/porting/manifest.t | 9 ++-- 30 files changed, 45 insertions(+), 140 deletions(-) create mode 100644 ext/SDBM_File/.gitignore rename ext/SDBM_File/{sdbm => }/CHANGES (100%) rename ext/SDBM_File/{sdbm => }/COMPARE (100%) rename ext/SDBM_File/{sdbm => }/README (100%) rename ext/SDBM_File/{sdbm => }/README.too (100%) rename ext/SDBM_File/{sdbm => }/biblio (100%) rename ext/SDBM_File/{sdbm => }/dba.c (100%) rename ext/SDBM_File/{sdbm => }/dbd.c (100%) rename ext/SDBM_File/{sdbm => }/dbe.1 (100%) rename ext/SDBM_File/{sdbm => }/dbe.c (100%) rename ext/SDBM_File/{sdbm => }/dbu.c (100%) rename ext/SDBM_File/{sdbm => }/grind (100%) rename ext/SDBM_File/{sdbm => }/hash.c (100%) rename ext/SDBM_File/{sdbm => }/linux.patches (100%) rename ext/SDBM_File/{sdbm => }/makefile.sdbm (100%) rename ext/SDBM_File/{sdbm => }/pair.c (100%) rename ext/SDBM_File/{sdbm => }/pair.h (100%) rename ext/SDBM_File/{sdbm => }/readme.ms (100%) rename ext/SDBM_File/{sdbm => }/sdbm.3 (100%) rename ext/SDBM_File/{sdbm => }/sdbm.c (100%) rename ext/SDBM_File/{sdbm => }/sdbm.h (100%) delete mode 100644 ext/SDBM_File/sdbm/.gitignore delete mode 100644 ext/SDBM_File/sdbm/Makefile.PL rename ext/SDBM_File/{sdbm => }/tune.h (100%) rename ext/SDBM_File/{sdbm => }/util.c (100%) diff --git a/MANIFEST b/MANIFEST index 6502631..fbca8eb 100644 --- a/MANIFEST +++ b/MANIFEST @@ -3857,36 +3857,35 @@ ext/re/t/re_funcs_u.t See if exportable 're' funcs in universal.c work ext/re/t/regop.pl generate debug output for various patterns ext/re/t/regop.t test RE optimizations by scraping debug output ext/re/t/re.t see if re pragma works +ext/SDBM_File/biblio SDBM kit +ext/SDBM_File/CHANGES SDBM kit +ext/SDBM_File/COMPARE SDBM kit +ext/SDBM_File/dba.c SDBM kit +ext/SDBM_File/dbd.c SDBM kit +ext/SDBM_File/dbe.1 SDBM kit +ext/SDBM_File/dbe.c SDBM kit +ext/SDBM_File/dbu.c SDBM kit +ext/SDBM_File/grind SDBM kit +ext/SDBM_File/hash.c SDBM kit +ext/SDBM_File/linux.patches SDBM kit ext/SDBM_File/Makefile.PL SDBM extension makefile writer -ext/SDBM_File/sdbm/biblio SDBM kit -ext/SDBM_File/sdbm/CHANGES SDBM kit -ext/SDBM_File/sdbm/COMPARE SDBM kit -ext/SDBM_File/sdbm/dba.c SDBM kit -ext/SDBM_File/sdbm/dbd.c SDBM kit -ext/SDBM_File/sdbm/dbe.1 SDBM kit -ext/SDBM_File/sdbm/dbe.c SDBM kit -ext/SDBM_File/sdbm/dbu.c SDBM kit +ext/SDBM_File/makefile.sdbm SDBM kit +ext/SDBM_File/pair.c SDBM kit +ext/SDBM_File/pair.h SDBM kit +ext/SDBM_File/README SDBM kit +ext/SDBM_File/readme.ms SDBM kit +ext/SDBM_File/README.too SDBM kit +ext/SDBM_File/sdbm.3 SDBM kit +ext/SDBM_File/sdbm.c SDBM kit ext/SDBM_File/SDBM_File.pm SDBM extension Perl module ext/SDBM_File/SDBM_File.xs SDBM extension external subroutines -ext/SDBM_File/sdbm/grind SDBM kit -ext/SDBM_File/sdbm/hash.c SDBM kit -ext/SDBM_File/sdbm/linux.patches SDBM kit -ext/SDBM_File/sdbm/Makefile.PL SDBM kit -ext/SDBM_File/sdbm/makefile.sdbm SDBM kit -ext/SDBM_File/sdbm/pair.c SDBM kit -ext/SDBM_File/sdbm/pair.h SDBM kit -ext/SDBM_File/sdbm/README SDBM kit -ext/SDBM_File/sdbm/readme.ms SDBM kit -ext/SDBM_File/sdbm/README.too SDBM kit -ext/SDBM_File/sdbm/sdbm.3 SDBM kit -ext/SDBM_File/sdbm/sdbm.c SDBM kit -ext/SDBM_File/sdbm/sdbm.h SDBM kit -ext/SDBM_File/sdbm/tune.h SDBM kit -ext/SDBM_File/sdbm/util.c SDBM kit +ext/SDBM_File/sdbm.h SDBM kit ext/SDBM_File/t/constants.t See if SDBM_File constants work ext/SDBM_File/t/prep.t See if SDBM_File with extra argument works ext/SDBM_File/t/sdbm.t See if SDBM_File works +ext/SDBM_File/tune.h SDBM kit ext/SDBM_File/typemap SDBM extension interface types +ext/SDBM_File/util.c SDBM kit ext/Sys-Hostname/Hostname.pm Sys::Hostname extension Perl module ext/Sys-Hostname/Hostname.xs Sys::Hostname extension external subroutines ext/Sys-Hostname/t/Hostname.t See if Sys::Hostname works diff --git a/ext/SDBM_File/.gitignore b/ext/SDBM_File/.gitignore new file mode 100644 index 0000000..acccbd0 --- /dev/null +++ b/ext/SDBM_File/.gitignore @@ -0,0 +1,2 @@ +!*.c +SDBM_File.c diff --git a/ext/SDBM_File/sdbm/CHANGES b/ext/SDBM_File/CHANGES similarity index 100% rename from ext/SDBM_File/sdbm/CHANGES rename to ext/SDBM_File/CHANGES diff --git a/ext/SDBM_File/sdbm/COMPARE b/ext/SDBM_File/COMPARE similarity index 100% rename from ext/SDBM_File/sdbm/COMPARE rename to ext/SDBM_File/COMPARE diff --git a/ext/SDBM_File/Makefile.PL b/ext/SDBM_File/Makefile.PL index 676708c..02f28c4 100644 --- a/ext/SDBM_File/Makefile.PL +++ b/ext/SDBM_File/Makefile.PL @@ -1,66 +1,17 @@ +use strict; use warnings; use ExtUtils::MakeMaker; -use Config; -# The existence of the ./sdbm/Makefile.PL file causes MakeMaker -# to automatically include Makefile code for the targets -# config, all, clean, realclean and sdbm/Makefile -# which perform the corresponding actions in the subdirectory. - -# Work around: Darwin ppc64 bug ignores archive contents when building bundles - -$define = ($^O eq 'MSWin32') ? '-DMSDOS' : ''; -if ($^O eq 'MSWin32') { $myextlib = 'sdbm\\libsdbm$(LIB_EXT)'; } -elsif ($^O eq 'darwin' && $Config{'ldflags'} =~/-arch ppc64/) { - $myextlib = '-all_load sdbm/libsdbm$(LIB_EXT)'; } -else { $myextlib = 'sdbm/libsdbm$(LIB_EXT)'; } +my $define = '-DSDBM -DDUFF'; +# no -DMSDOS because MSDOS and WIN32 treated same in code +$define .= ' -DWIN32 -DPERL_STATIC_SYMS' if $^O eq 'MSWin32'; WriteMakefile( - NAME => 'SDBM_File', - MYEXTLIB => $myextlib, - XSPROTOARG => '-noprototypes', # XXX remove later? - VERSION_FROM => 'SDBM_File.pm', - DEFINE => $define, - ); - -# We don't want the default subdir rule, as it creates a race condition with the -# rule we add below. -sub MY::subdir_x { - return ''; -} - -sub MY::postamble { - if ($^O =~ /MSWin32/ && !defined($ENV{SYSTEMROOT})) { - if ($Config{'make'} =~ /dmake/i) { - # dmake-specific - return <<'EOT'; -$(MYEXTLIB): sdbm/Makefile -@[ - cd sdbm - $(MAKE) all - cd .. -] -EOT - } elsif ($Config{'make'} =~ /nmake/i) { - # - return <<'EOT'; -$(MYEXTLIB): sdbm/Makefile - cd sdbm - $(MAKE) all - cd .. -EOT - } -} elsif ($^O ne 'VMS') { - ' -$(MYEXTLIB): sdbm/Makefile - cd sdbm && $(MAKE) all -'; - } - else { - ' -$(MYEXTLIB) : [.sdbm]descrip.mms - set def [.sdbm] - $(MMS) all - set def [-] -'; - } -} + NAME => 'SDBM_File', + VERSION_FROM => 'SDBM_File.pm', + DEFINE => $define, + INC => '-I$(PERL_INC)', # force PERL_INC dir ahead of system -I's + OBJECT => '$(O_FILES)', + clean => {'FILES' => 'dbu dbd dba dbe x-dbu *.dir *.pag'}, + H => [qw(tune.h sdbm.h pair.h $(PERL_INC)/config.h)], + C => [qw(SDBM_File.c sdbm.c pair.c hash.c)], +); diff --git a/ext/SDBM_File/sdbm/README b/ext/SDBM_File/README similarity index 100% rename from ext/SDBM_File/sdbm/README rename to ext/SDBM_File/README diff --git a/ext/SDBM_File/sdbm/README.too b/ext/SDBM_File/README.too similarity index 100% rename from ext/SDBM_File/sdbm/README.too rename to ext/SDBM_File/README.too diff --git a/ext/SDBM_File/SDBM_File.pm b/ext/SDBM_File/SDBM_File.pm index f1f85f5..707a9f8 100644 --- a/ext/SDBM_File/SDBM_File.pm +++ b/ext/SDBM_File/SDBM_File.pm @@ -7,7 +7,7 @@ require Tie::Hash; require XSLoader; our @ISA = qw(Tie::Hash); -our $VERSION = "1.12"; +our $VERSION = "1.13"; our @EXPORT_OK = qw(PAGFEXT DIRFEXT PAIRMAX); use Exporter "import"; diff --git a/ext/SDBM_File/SDBM_File.xs b/ext/SDBM_File/SDBM_File.xs index bb994f7..434784a 100644 --- a/ext/SDBM_File/SDBM_File.xs +++ b/ext/SDBM_File/SDBM_File.xs @@ -2,7 +2,7 @@ #include "EXTERN.h" #include "perl.h" #include "XSUB.h" -#include "sdbm/sdbm.h" +#include "sdbm.h" #define fetch_key 0 #define store_key 1 diff --git a/ext/SDBM_File/sdbm/biblio b/ext/SDBM_File/biblio similarity index 100% rename from ext/SDBM_File/sdbm/biblio rename to ext/SDBM_File/biblio diff --git a/ext/SDBM_File/sdbm/dba.c b/ext/SDBM_File/dba.c similarity index 100% rename from ext/SDBM_File/sdbm/dba.c rename to ext/SDBM_File/dba.c diff --git a/ext/SDBM_File/sdbm/dbd.c b/ext/SDBM_File/dbd.c similarity index 100% rename from ext/SDBM_File/sdbm/dbd.c rename to ext/SDBM_File/dbd.c diff --git a/ext/SDBM_File/sdbm/dbe.1 b/ext/SDBM_File/dbe.1 similarity index 100% rename from ext/SDBM_File/sdbm/dbe.1 rename to ext/SDBM_File/dbe.1 diff --git a/ext/SDBM_File/sdbm/dbe.c b/ext/SDBM_File/dbe.c similarity index 100% rename from ext/SDBM_File/sdbm/dbe.c rename to ext/SDBM_File/dbe.c diff --git a/ext/SDBM_File/sdbm/dbu.c b/ext/SDBM_File/dbu.c similarity index 100% rename from ext/SDBM_File/sdbm/dbu.c rename to ext/SDBM_File/dbu.c diff --git a/ext/SDBM_File/sdbm/grind b/ext/SDBM_File/grind similarity index 100% rename from ext/SDBM_File/sdbm/grind rename to ext/SDBM_File/grind diff --git a/ext/SDBM_File/sdbm/hash.c b/ext/SDBM_File/hash.c similarity index 100% rename from ext/SDBM_File/sdbm/hash.c rename to ext/SDBM_File/hash.c diff --git a/ext/SDBM_File/sdbm/linux.patches b/ext/SDBM_File/linux.patches similarity index 100% rename from ext/SDBM_File/sdbm/linux.patches rename to ext/SDBM_File/linux.patches diff --git a/ext/SDBM_File/sdbm/makefile.sdbm b/ext/SDBM_File/makefile.sdbm similarity index 100% rename from ext/SDBM_File/sdbm/makefile.sdbm rename to ext/SDBM_File/makefile.sdbm diff --git a/ext/SDBM_File/sdbm/pair.c b/ext/SDBM_File/pair.c similarity index 100% rename from ext/SDBM_File/sdbm/pair.c rename to ext/SDBM_File/pair.c diff --git a/ext/SDBM_File/sdbm/pair.h b/ext/SDBM_File/pair.h similarity index 100% rename from ext/SDBM_File/sdbm/pair.h rename to ext/SDBM_File/pair.h diff --git a/ext/SDBM_File/sdbm/readme.ms b/ext/SDBM_File/readme.ms similarity index 100% rename from ext/SDBM_File/sdbm/readme.ms rename to ext/SDBM_File/readme.ms diff --git a/ext/SDBM_File/sdbm/sdbm.3 b/ext/SDBM_File/sdbm.3 similarity index 100% rename from ext/SDBM_File/sdbm/sdbm.3 rename to ext/SDBM_File/sdbm.3 diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm.c similarity index 100% rename from ext/SDBM_File/sdbm/sdbm.c rename to ext/SDBM_File/sdbm.c diff --git a/ext/SDBM_File/sdbm/sdbm.h b/ext/SDBM_File/sdbm.h similarity index 100% rename from ext/SDBM_File/sdbm/sdbm.h rename to ext/SDBM_File/sdbm.h diff --git a/ext/SDBM_File/sdbm/.gitignore b/ext/SDBM_File/sdbm/.gitignore deleted file mode 100644 index 289833e..0000000 --- a/ext/SDBM_File/sdbm/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -!*.c -*.a diff --git a/ext/SDBM_File/sdbm/Makefile.PL b/ext/SDBM_File/sdbm/Makefile.PL deleted file mode 100644 index c02c75b..0000000 --- a/ext/SDBM_File/sdbm/Makefile.PL +++ /dev/null @@ -1,48 +0,0 @@ -use ExtUtils::MakeMaker; - -my $define = '-DSDBM -DDUFF'; -$define .= ' -DWIN32 -DPERL_STATIC_SYMS' if ($^O eq 'MSWin32'); - -WriteMakefile( - NAME => 'sdbm', # (doesn't matter what the name is here) oh yes it does -# LINKTYPE => 'static', - DEFINE => $define, - INC => '-I$(PERL_INC)', # force PERL_INC dir ahead of system -I's - SKIP => [qw(dynamic dynamic_lib dlsyms)], - OBJECT => '$(O_FILES)', - clean => {'FILES' => 'dbu libsdbm.a dbd dba dbe x-dbu *.dir *.pag'}, - H => [qw(tune.h sdbm.h pair.h $(PERL_INC)/config.h)], - C => [qw(sdbm.c pair.c hash.c)] -); - -sub MY::constants { - package MY; - my $self = shift; - - $self->{INST_STATIC} = 'libsdbm$(LIB_EXT)'; - - return $self->SUPER::constants(); -} - -sub MY::top_targets { - my $r = ' -all :: static - $(NOECHO) $(NOOP) - -config :: - $(NOECHO) $(NOOP) - -lint: - lint -abchx $(LIBSRCS) - -'; - $r .= ' -# This is a workaround, the problem is that our old GNU make exports -# variables into the environment so $(MYEXTLIB) is set in here to this -# value which can not be built. -sdbm/libsdbm.a: - $(NOECHO) $(NOOP) -' unless $^O eq 'VMS'; - - return $r; -} diff --git a/ext/SDBM_File/sdbm/tune.h b/ext/SDBM_File/tune.h similarity index 100% rename from ext/SDBM_File/sdbm/tune.h rename to ext/SDBM_File/tune.h diff --git a/ext/SDBM_File/sdbm/util.c b/ext/SDBM_File/util.c similarity index 100% rename from ext/SDBM_File/sdbm/util.c rename to ext/SDBM_File/util.c diff --git a/t/porting/manifest.t b/t/porting/manifest.t index a88f364..01cbd1c 100644 --- a/t/porting/manifest.t +++ b/t/porting/manifest.t @@ -88,9 +88,12 @@ SKIP: { skip("git ls-files didnt work",3) if !@repo; is( 0+@repo, 0+@files, "git ls-files gives the same number of files as MANIFEST lists"); - my %repo= map { $_ => 1 } @repo; - my %mani= map { $_ => 1 } @files; - is( 0+keys %mani, 0+@files, "no duplicate files in MANIFEST"); + my %repo; + ++$repo{$_} for @repo; + my %mani; + ++$mani{$_} for @files; + is( 0+keys %mani, 0+@files, "no duplicate files in MANIFEST") + or diag(join("\n ", "Duplicates:",grep $mani{$_} > 1, keys %mani)); delete $mani{$_} for @repo; delete $repo{$_} for @files; my @not_in_mani= keys %repo; -- Perl5 Master Repository
