From: Gurusamy Sarathy Date: Fri, 5 Jun 1998 19:03:14 +0000 (+0000) Subject: [win32] delete undiscussed AS changes for PPD (broke .packlist X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7c3342ddfdaad110556ad89a6bece362672559fe;p=p5sagit%2Fp5-mst-13.2.git [win32] delete undiscussed AS changes for PPD (broke .packlist mechanism) p4raw-id: //depot/win32/perl@1076 --- diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 729906d..cf22f2d 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -208,7 +208,6 @@ sub ExtUtils::MM_Unix::pm_to_blib ; sub ExtUtils::MM_Unix::post_constants ; sub ExtUtils::MM_Unix::post_initialize ; sub ExtUtils::MM_Unix::postamble ; -sub ExtUtils::MM_Unix::ppd ; sub ExtUtils::MM_Unix::prefixify ; sub ExtUtils::MM_Unix::processPL ; sub ExtUtils::MM_Unix::realclean ; @@ -2578,45 +2577,6 @@ sub parse_version { return $result; } -=item parse_abstract - -parse a file and return what you think is the ABSTRACT - -=cut - -sub parse_abstract { - my($self,$parsefile) = @_; - my $result; - local *FH; - local $/ = "\n"; - open(FH,$parsefile) or die "Could not open '$parsefile': $!"; - my $inpod = 0; - my $package = $self->{DISTNAME}; - $package =~ s/-/::/; - while () { - $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod; - next if !$inpod; - chop; - next unless /^($package\s-\s)(.*)/; - $result = $2; -# my $eval = qq{ -# package ExtUtils::MakeMaker::_version; -# no strict; -# -# local $1$2; -# \$$2=undef; do { -# $_ -# }; \$$2 -# }; -# local($^W) = 0; -# $result = eval($eval); -# die "Could not eval '$eval' in $parsefile: $@" if $@; -# $result = "undef" unless defined $result; - last; - } - close FH; - return $result; -} =item pasthru (o) @@ -2716,49 +2676,6 @@ $(OBJECT) : $(PERL_HDRS) join "\n", @m; } -=item ppd - -Defines target that creates a PPD (Perl Package Description) file -for a binary distribution. - -=cut - -sub ppd { - my($self) = @_; - my(@m); - if ($self->{ABSTRACT_FROM}){ - $self->{ABSTRACT} = $self->parse_abstract($self->{ABSTRACT_FROM}) or - Carp::carp "WARNING: Setting ABSTRACT via file '$self->{ABSTRACT_FROM}' failed\n" - } - my ($pack_ver) = join ",", (split (/\./, $self->{VERSION}), (0) x 4) [0 .. 3]; - push(@m, "# Creates a PPD (Perl Package Description) for a binary distribution.\n"); - push(@m, "ppd:\n"); - push(@m, "\t\@\$(PERL) -e \"print qq{{DISTNAME}\\\" VERSION=\\\"$pack_ver\\\">\\n}"); - push(@m, ". qq{\\t$self->{DISTNAME}\\n}"); - my $abstract = $self->{ABSTRACT}; - $abstract =~ s//>/g; - push(@m, ". qq{\\t$abstract\\n}"); - my ($author) = $self->{AUTHOR}; - $author =~ s/@/\\@/g; - push(@m, ". qq{\\t$author\\n}"); - push(@m, ". qq{\\t\\n}"); - my ($prereq); - foreach $prereq (sort keys %{$self->{PREREQ_PM}}) { - my $pre_req = $prereq; - $pre_req =~ s/::/-/g; - push(@m, ". qq{\\t\\t\\n}"); - } - push(@m, ". qq{\\t\\t\\n}"); - my ($bin_location) = $self->{BINARY_LOCATION}; - $bin_location =~ s/\\/\\\\/g; - push(@m, ". qq{\\t\\t\\n}"); - push(@m, ". qq{\\t\\n}"); - push(@m, ". qq{\\n}\" > $self->{DISTNAME}.ppd"); - - join("", @m); -} - =item pm_to_blib Defines target that copies all files in the hash PM to their diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm index 168c98d..e640865 100644 --- a/lib/ExtUtils/MakeMaker.pm +++ b/lib/ExtUtils/MakeMaker.pm @@ -235,7 +235,7 @@ sub full_setup { @Attrib_help = qw/ - AUTHOR ABSTRACT ABSTRACT_FROM BINARY_LOCATION LICENSE_HREF CAPI + CAPI C CCFLAGS CONFIG CONFIGURE DEFINE DIR DISTNAME DL_FUNCS DL_VARS EXE_FILES EXCLUDE_EXT INCLUDE_EXT NO_VC FIRST_MAKEFILE FULLPERL H INC INSTALLARCHLIB INSTALLBIN INSTALLDIRS INSTALLMAN1DIR @@ -279,7 +279,7 @@ sub full_setup { c_o xs_c xs_o top_targets linkext dlsyms dynamic dynamic_bs dynamic_lib static static_lib manifypods processPL installbin subdirs clean realclean dist_basics dist_core dist_dir dist_test dist_ci - install force perldepend makefile staticmake test ppd + install force perldepend makefile staticmake test ); # loses section ordering @@ -308,7 +308,7 @@ sub full_setup { @Get_from_Config = qw( ar cc cccdlflags ccdlflags dlext dlsrc ld lddlflags ldflags libc - lib_ext obj_ext osname osvers ranlib sitelibexp sitearchexp so exe_ext + lib_ext obj_ext ranlib sitelibexp sitearchexp so exe_ext ); my $item; @@ -382,9 +382,8 @@ sub ExtUtils::MakeMaker::new { eval $eval; if ($@){ warn "Warning: prerequisite $prereq $self->{PREREQ_PM}->{$prereq} not found"; -# mjn -# } else { -# delete $self->{PREREQ_PM}{$prereq}; + } else { + delete $self->{PREREQ_PM}{$prereq}; } } # if (@unsatisfied){