X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExtUtils%2FMM_VMS.pm;h=ceb51105a535be10937a31a873e1006633f6c0ce;hb=3e15aad56068d2dfe80836fe1f37f2b0000476ee;hp=4dd3ac30109e5a4ead65b7f79be3ae086272e4a2;hpb=479fe7a52d5dd4d7b7ae98dfc47284617242b327;p=p5sagit%2Fp5-mst-13.2.git diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm index 4dd3ac3..ceb5110 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -1,13 +1,8 @@ -# MM_VMS.pm -# MakeMaker default methods for VMS -# -# Author: Charles Bailey bailey@newman.upenn.edu - package ExtUtils::MM_VMS; use strict; -use Config; +use ExtUtils::MakeMaker::Config; require Exporter; BEGIN { @@ -19,15 +14,18 @@ BEGIN { } use File::Basename; -use vars qw($Revision @ISA $VERSION); -($VERSION) = '5.67'; -($Revision) = q$Revision: 1.97 $ =~ /Revision:\s+(\S+)/; + +# $Revision can't be on the same line or SVN/K gets confused +use vars qw($Revision + $VERSION @ISA); +$VERSION = '6.38'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); use ExtUtils::MakeMaker qw($Verbose neatvalue); +$Revision = $ExtUtils::MakeMaker::Revision; =head1 NAME @@ -164,25 +162,33 @@ sub find_perl { my($rslt); my($inabs) = 0; local *TCF; - # Check in relative directories first, so we pick up the current - # version of Perl if we're running MakeMaker as part of the main build. - @sdirs = sort { my($absa) = $self->file_name_is_absolute($a); - my($absb) = $self->file_name_is_absolute($b); - if ($absa && $absb) { return $a cmp $b } - else { return $absa ? 1 : ($absb ? -1 : ($a cmp $b)); } - } @$dirs; - # Check miniperl before perl, and check names likely to contain - # version numbers before "generic" names, so we pick up an - # executable that's less likely to be from an old installation. - @snames = sort { my($ba) = $a =~ m!([^:>\]/]+)$!; # basename - my($bb) = $b =~ m!([^:>\]/]+)$!; - my($ahasdir) = (length($a) - length($ba) > 0); - my($bhasdir) = (length($b) - length($bb) > 0); - if ($ahasdir and not $bhasdir) { return 1; } - elsif ($bhasdir and not $ahasdir) { return -1; } - else { $bb =~ /\d/ <=> $ba =~ /\d/ - or substr($ba,0,1) cmp substr($bb,0,1) - or length($bb) <=> length($ba) } } @$names; + + if( $self->{PERL_CORE} ) { + # Check in relative directories first, so we pick up the current + # version of Perl if we're running MakeMaker as part of the main build. + @sdirs = sort { my($absa) = $self->file_name_is_absolute($a); + my($absb) = $self->file_name_is_absolute($b); + if ($absa && $absb) { return $a cmp $b } + else { return $absa ? 1 : ($absb ? -1 : ($a cmp $b)); } + } @$dirs; + # Check miniperl before perl, and check names likely to contain + # version numbers before "generic" names, so we pick up an + # executable that's less likely to be from an old installation. + @snames = sort { my($ba) = $a =~ m!([^:>\]/]+)$!; # basename + my($bb) = $b =~ m!([^:>\]/]+)$!; + my($ahasdir) = (length($a) - length($ba) > 0); + my($bhasdir) = (length($b) - length($bb) > 0); + if ($ahasdir and not $bhasdir) { return 1; } + elsif ($bhasdir and not $ahasdir) { return -1; } + else { $bb =~ /\d/ <=> $ba =~ /\d/ + or substr($ba,0,1) cmp substr($bb,0,1) + or length($bb) <=> length($ba) } } @$names; + } + else { + @sdirs = @$dirs; + @snames = @$names; + } + # Image names containing Perl version use '_' instead of '.' under VMS foreach $name (@snames) { $name =~ s/\.(\d+)$/_$1/; } if ($trace >= 2){ @@ -273,6 +279,51 @@ sub maybe_command { return 0; } + +=item pasthru (override) + +VMS has $(MMSQUALIFIERS) which is a listing of all the original command line +options. This is used in every invocation of make in the VMS Makefile so +PASTHRU should not be necessary. Using PASTHRU tends to blow commands past +the 256 character limit. + +=cut + +sub pasthru { + return "PASTHRU=\n"; +} + + +=item pm_to_blib (override) + +VMS wants a dot in every file so we can't have one called 'pm_to_blib', +it becomes 'pm_to_blib.' and MMS/K isn't smart enough to know that when +you have a target called 'pm_to_blib' it should look for 'pm_to_blib.'. + +So in VMS its pm_to_blib.ts. + +=cut + +sub pm_to_blib { + my $self = shift; + + my $make = $self->SUPER::pm_to_blib; + + $make =~ s{^pm_to_blib :}{pm_to_blib.ts :}m; + $make =~ s{\$\(TOUCH\) pm_to_blib}{\$(TOUCH) pm_to_blib.ts}; + + $make = <<'MAKE' . $make; +# Dummy target to match Unix target name; we use pm_to_blib.ts as +# timestamp file to avoid repeated invocations under VMS +pm_to_blib : pm_to_blib.ts + $(NOECHO) $(NOOP) + +MAKE + + return $make; +} + + =item perl_script (override) If name passed in doesn't specify a readable file, appends F<.com> or @@ -289,6 +340,7 @@ sub perl_script { return ''; } + =item replace_manpage_separator Use as separator a character which is legal in a VMS-syntax file name. @@ -302,6 +354,26 @@ sub replace_manpage_separator { $man; } +=item init_DEST + +(override) Because of the difficulty concatenating VMS filepaths we +must pre-expand the DEST* variables. + +=cut + +sub init_DEST { + my $self = shift; + + $self->SUPER::init_DEST; + + # Expand DEST variables. + foreach my $var ($self->installvars) { + my $destvar = 'DESTINSTALL'.$var; + $self->{$destvar} = File::Spec->eliminate_macros($self->{$destvar}); + } +} + + =item init_DIRFILESEP No seperator between a directory path and a filename on VMS. @@ -375,18 +447,33 @@ sub init_others { $self->{NOOP} = 'Continue'; $self->{NOECHO} ||= '@ '; - $self->{MAKEFILE} ||= 'Descrip.MMS'; + $self->{MAKEFILE} ||= $self->{FIRST_MAKEFILE} || 'Descrip.MMS'; $self->{FIRST_MAKEFILE} ||= $self->{MAKEFILE}; $self->{MAKE_APERL_FILE} ||= 'Makeaperl.MMS'; - $self->{MAKEFILE_OLD} ||= '$(FIRST_MAKEFILE)_old'; - - $self->{ECHO} ||= '$(PERLRUN) -le "print qq{@ARGV}"'; - $self->{TOUCH} ||= '$(PERLRUN) "-MExtUtils::Command" -e touch'; - $self->{CHMOD} ||= '$(PERLRUN) "-MExtUtils::Command" -e chmod'; - $self->{RM_F} ||= '$(PERLRUN) "-MExtUtils::Command" -e rm_f'; - $self->{RM_RF} ||= '$(PERLRUN) "-MExtUtils::Command" -e rm_rf'; - $self->{TEST_F} ||= '$(PERLRUN) "-MExtUtils::Command" -e test_f'; - $self->{EQUALIZE_TIMESTAMP} ||= '$(PERLRUN) -we "open F,qq{>>$ARGV[1]};close F;utime(0,(stat($ARGV[0]))[9]+1,$ARGV[1])"'; + $self->{MAKEFILE_OLD} ||= $self->eliminate_macros('$(FIRST_MAKEFILE)_old'); +# +# If an extension is not specified, then MMS/MMK assumes an +# an extension of .MMS. If there really is no extension, +# then a trailing "." needs to be appended to specify a +# a null extension. +# + $self->{MAKEFILE} .= '.' unless $self->{MAKEFILE} =~ m/\./; + $self->{FIRST_MAKEFILE} .= '.' unless $self->{FIRST_MAKEFILE} =~ m/\./; + $self->{MAKE_APERL_FILE} .= '.' unless $self->{MAKE_APERL_FILE} =~ m/\./; + $self->{MAKEFILE_OLD} .= '.' unless $self->{MAKEFILE_OLD} =~ m/\./; + + $self->{MACROSTART} ||= '/Macro=('; + $self->{MACROEND} ||= ')'; + $self->{USEMAKEFILE} ||= '/Descrip='; + + $self->{ECHO} ||= '$(ABSPERLRUN) -le "print qq{@ARGV}"'; + $self->{ECHO_N} ||= '$(ABSPERLRUN) -e "print qq{@ARGV}"'; + $self->{TOUCH} ||= '$(ABSPERLRUN) "-MExtUtils::Command" -e touch'; + $self->{CHMOD} ||= '$(ABSPERLRUN) "-MExtUtils::Command" -e chmod'; + $self->{RM_F} ||= '$(ABSPERLRUN) "-MExtUtils::Command" -e rm_f'; + $self->{RM_RF} ||= '$(ABSPERLRUN) "-MExtUtils::Command" -e rm_rf'; + $self->{TEST_F} ||= '$(ABSPERLRUN) "-MExtUtils::Command" -e test_f'; + $self->{EQUALIZE_TIMESTAMP} ||= '$(ABSPERLRUN) -we "open F,qq{>>$ARGV[1]};close F;utime(0,(stat($ARGV[0]))[9]+1,$ARGV[1])"'; $self->{MOD_INSTALL} ||= $self->oneliner(<<'CODE', ['-MExtUtils::Install']); @@ -395,11 +482,18 @@ CODE $self->{SHELL} ||= 'Posix'; - $self->{CP} = 'Copy/NoConfirm'; - $self->{MV} = 'Rename/NoConfirm'; + $self->SUPER::init_others; + + # So we can copy files into directories with less fuss + $self->{CP} = '$(ABSPERLRUN) "-MExtUtils::Command" -e cp'; + $self->{MV} = '$(ABSPERLRUN) "-MExtUtils::Command" -e mv'; + $self->{UMASK_NULL} = '! '; - $self->SUPER::init_others; + # Redirection on VMS goes before the command, not after as on Unix. + # $(DEV_NULL) is used once and its not worth going nuts over making + # it work. However, Unix's DEV_NULL is quite wrong for VMS. + $self->{DEV_NULL} = ''; if ($self->{OBJECT} =~ /\s/) { $self->{OBJECT} =~ s/(\\)?\n+\s+/ /g; @@ -486,13 +580,10 @@ sub constants { # Cleanup paths for directories in MMS macros. foreach my $macro ( qw [ INST_BIN INST_SCRIPT INST_LIB INST_ARCHLIB - INSTALLPRIVLIB INSTALLSITELIB INSTALLVENDORLIB - INSTALLARCHLIB INSTALLSITEARCH INSTALLVENDORARCH - INSTALLBIN INSTALLSITEBIN INSTALLVENDORBIN INSTALLSCRIPT - INSTALLMAN1DIR INSTALLSITEMAN1DIR INSTALLVENDORMAN1DIR - INSTALLMAN3DIR INSTALLSITEMAN3DIR INSTALLVENDORMAN3DIR PERL_LIB PERL_ARCHLIB - PERL_INC PERL_SRC ] ) + PERL_INC PERL_SRC ], + (map { 'INSTALL'.$_ } $self->installvars) + ) { next unless defined $self->{$macro}; next if $macro =~ /MAN/ && $self->{$macro} eq 'none'; @@ -537,6 +628,9 @@ sub constants { $self->{$macro} = \@tmp; } + # mms/k does not define a $(MAKE) macro. + $self->{MAKE} = '$(MMS)$(MMSQUALIFIERS)'; + return $self->SUPER::constants; } @@ -698,139 +792,6 @@ sub const_cccmd { } -=item tool_sxubpp (override) - -Use VMS-style quoting on xsubpp command line. - -=cut - -sub tool_xsubpp { - my($self) = @_; - return '' unless $self->needs_linking; - - my $xsdir; - foreach my $dir (@INC) { - $xsdir = $self->catdir($dir, 'ExtUtils'); - if( -r $self->catfile($xsdir, "xsubpp") ) { - last; - } - } - - my $tmdir = File::Spec->catdir($self->{PERL_LIB},"ExtUtils"); - my(@tmdeps) = $self->catfile($tmdir,'typemap'); - if( $self->{TYPEMAPS} ){ - my $typemap; - foreach $typemap (@{$self->{TYPEMAPS}}){ - if( ! -f $typemap ){ - warn "Typemap $typemap not found.\n"; - } - else{ - push(@tmdeps, $self->fixpath($typemap,0)); - } - } - } - push(@tmdeps, "typemap") if -f "typemap"; - my(@tmargs) = map("-typemap $_", @tmdeps); - if( exists $self->{XSOPT} ){ - unshift( @tmargs, $self->{XSOPT} ); - } - - if ($Config{'ldflags'} && - $Config{'ldflags'} =~ m!/Debug!i && - (!exists($self->{XSOPT}) || $self->{XSOPT} !~ /linenumbers/)) { - unshift(@tmargs,'-nolinenumbers'); - } - my $xsubpp_version = $self->xsubpp_version($self->catfile($xsdir,'xsubpp')); - - # What are the correct thresholds for version 1 && 2 Paul? - if ( $xsubpp_version > 1.923 ){ - $self->{XSPROTOARG} = '' unless defined $self->{XSPROTOARG}; - } else { - if (defined $self->{XSPROTOARG} && $self->{XSPROTOARG} =~ /\-prototypes/) { - print STDOUT qq{Warning: This extension wants to pass the switch "-prototypes" to xsubpp. - Your version of xsubpp is $xsubpp_version and cannot handle this. - Please upgrade to a more recent version of xsubpp. -}; - } else { - $self->{XSPROTOARG} = ""; - } - } - - " -XSUBPPDIR = $xsdir -XSUBPP = \$(PERLRUN) \$(XSUBPPDIR)xsubpp -XSPROTOARG = $self->{XSPROTOARG} -XSUBPPDEPS = @tmdeps -XSUBPPARGS = @tmargs -"; -} - -=item xsubpp_version (override) - -Test xsubpp exit status according to VMS rules ($sts & 1 ==E good) -rather than Unix rules ($sts == 0 ==E good). - -=cut - -sub xsubpp_version -{ - my($self,$xsubpp) = @_; - my ($version) ; - return '' unless $self->needs_linking; - - # try to figure out the version number of the xsubpp on the system - - # first try the -v flag, introduced in 1.921 & 2.000a2 - - my $command = qq{$self->{PERL} "-I$self->{PERL_LIB}" $xsubpp -v}; - print "Running: $command\n" if $Verbose; - $version = `$command` ; - if ($?) { - use ExtUtils::MakeMaker::vmsish 'status'; - warn "Running '$command' exits with status $?"; - } - chop $version ; - - return $1 if $version =~ /^xsubpp version (.*)/ ; - - # nope, then try something else - - my $counter = '000'; - my ($file) = 'temp' ; - $counter++ while -e "$file$counter"; # don't overwrite anything - $file .= $counter; - - local(*F); - open(F, ">$file") or die "Cannot open file '$file': $!\n" ; - print F < 1.92 and 2.000a1 - return $1 if $text =~ /automatically by xsubpp version ([\S]+)\s*/ ; - - # it is either 1.0 or 1.1 - return 1.1 if $text =~ /^Warning: ignored semicolon/ ; - - # none of the above, so 1.0 - return "1.0" ; -} - =item tools_other (override) Throw in some dubious extra macros for Makefile args. @@ -846,14 +807,8 @@ sub tools_other { # than just typing the literal string. my $extra_tools = <<'EXTRA_TOOLS'; -# Assumes $(MMS) invokes MMS or MMK -# (It is assumed in some cases later that the default makefile name -# (Descrip.MMS for MM[SK]) is used.) -USEMAKEFILE = /Descrip= -USEMACROS = /Macro=( -MACROEND = ) - # Just in case anyone is using the old macro. +USEMACROS = $(MACROSTART) SAY = $(ECHO) EXTRA_TOOLS @@ -931,7 +886,7 @@ sub xs_c { return '' unless $self->needs_linking(); ' .xs.c : - $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $(MMS$TARGET_NAME).xs >$(MMS$TARGET) + $(XSUBPPRUN) $(XSPROTOARG) $(XSUBPPARGS) $(MMS$TARGET_NAME).xs >$(MMS$TARGET) '; } @@ -946,7 +901,7 @@ sub xs_o { # many makes are too dumb to use xs_c then c_o return '' unless $self->needs_linking(); ' .xs$(OBJ_EXT) : - $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $(MMS$TARGET_NAME).xs >$(MMS$TARGET_NAME).c + $(XSUBPPRUN) $(XSPROTOARG) $(XSUBPPARGS) $(MMS$TARGET_NAME).xs >$(MMS$TARGET_NAME).c $(CCCMD) $(CCCDLFLAGS) $(MMS$TARGET_NAME).c '; } @@ -1057,44 +1012,14 @@ INST_DYNAMIC_DEP = $inst_dynamic_dep "; push @m, ' -$(INST_DYNAMIC) : $(INST_STATIC) $(PERL_INC)perlshr_attr.opt $(INST_ARCHAUTODIR)$(DIRFILESEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP) - $(NOECHO) $(MKPATH) $(INST_ARCHAUTODIR) +$(INST_DYNAMIC) : $(INST_STATIC) $(PERL_INC)perlshr_attr.opt $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP) If F$TrnLNm("',$shr,'").eqs."" Then Define/NoLog/User ',"$shr Sys\$Share:$shr.$Config{'dlext'}",' Link $(LDFLAGS) /Shareable=$(MMS$TARGET)$(OTHERLDFLAGS) $(BASEEXT).opt/Option,$(PERL_INC)perlshr_attr.opt/Option '; - push @m, $self->dir_target('$(INST_ARCHAUTODIR)'); join('',@m); } -=item dynamic_bs (override) - -Use VMS-style quoting on Mkbootstrap command line. - -=cut - -sub dynamic_bs { - my($self, %attribs) = @_; - return ' -BOOTSTRAP = -' unless $self->has_link_code(); - ' -BOOTSTRAP = '."$self->{BASEEXT}.bs".' - -# As MakeMaker mkbootstrap might not write a file (if none is required) -# we use touch to prevent make continually trying to remake it. -# The DynaLoader only reads a non-empty file. -$(BOOTSTRAP) : $(FIRST_MAKEFILE) '."$self->{BOOTDEP}".' $(INST_ARCHAUTODIR)$(DIRFILESEP).exists - $(NOECHO) $(ECHO) "Running mkbootstrap for $(NAME) ($(BSLOADLIBS))" - $(NOECHO) $(PERLRUN) - - -e "use ExtUtils::Mkbootstrap; Mkbootstrap(\'$(BASEEXT)\',\'$(BSLOADLIBS)\');" - $(NOECHO) $(TOUCH) $(MMS$TARGET) - -$(INST_BOOT) : $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DIRFILESEP).exists - $(NOECHO) $(RM_RF) $(INST_BOOT) - - $(CP) $(BOOTSTRAP) $(INST_BOOT) -'; -} =item static_lib (override) @@ -1114,7 +1039,7 @@ $(INST_STATIC) : my(@m,$lib); push @m,' # Rely on suffix rule for update action -$(OBJECT) : $(INST_ARCHAUTODIR)$(DIRFILESEP).exists +$(OBJECT) : $(INST_ARCHAUTODIR)$(DFSEP).exists $(INST_STATIC) : $(OBJECT) $(MYEXTLIB) '; @@ -1128,7 +1053,7 @@ $(INST_STATIC) : $(OBJECT) $(MYEXTLIB) # 'cause it's a library and you can't stick them in other libraries. # In that case, we use $OBJECT instead and hope for the best if ($self->{MYEXTLIB}) { - push(@m,"\t",'Library/Object/Replace $(MMS$TARGET) $(OBJECT)',"\n"); + push(@m,"\t",'Library/Object/Replace $(MMS$TARGET) $(OBJECT)',"\n"); } else { push(@m,"\t",'Library/Object/Replace $(MMS$TARGET) $(MMS$SOURCE_LIST)',"\n"); } @@ -1137,286 +1062,30 @@ $(INST_STATIC) : $(OBJECT) $(MYEXTLIB) foreach $lib (split ' ', $self->{EXTRALIBS}) { push(@m,"\t",'$(NOECHO) $(PERL) -e "print qq{',$lib,'\n}" >>$(INST_ARCHAUTODIR)extralibs.ld',"\n"); } - push @m, $self->dir_target('$(INST_ARCHAUTODIR)'); - join('',@m); -} - - -=item processPL (override) - -Use VMS-style quoting on command line. - -=cut - -sub processPL { - my($self) = @_; - return "" unless $self->{PL_FILES}; - my(@m, $plfile); - foreach $plfile (sort keys %{$self->{PL_FILES}}) { - my $list = ref($self->{PL_FILES}->{$plfile}) - ? $self->{PL_FILES}->{$plfile} - : [$self->{PL_FILES}->{$plfile}]; - foreach my $target (@$list) { - my $vmsplfile = vmsify($plfile); - my $vmsfile = vmsify($target); - push @m, " -all :: $vmsfile - \$(NOECHO) \$(NOOP) - -$vmsfile :: $vmsplfile -",' $(PERLRUNINST) '," $vmsplfile $vmsfile -"; - } - } - join "", @m; -} - -=item installbin (override) - -Stay under DCL's 255 character command line limit once again by -splitting potentially long list of files across multiple lines -in C target. - -=cut - -sub installbin { - my($self) = @_; - return '' unless $self->{EXE_FILES} && ref $self->{EXE_FILES} eq "ARRAY"; - return '' unless @{$self->{EXE_FILES}}; - my(@m, $from, $to, %fromto, @to); - my(@exefiles) = map { vmsify($_) } @{$self->{EXE_FILES}}; - for $from (@exefiles) { - my($path) = '$(INST_SCRIPT)' . basename($from); - local($_) = $path; # backward compatibility - $to = $self->libscan($path); - print "libscan($from) => '$to'\n" if ($Verbose >=2); - $fromto{$from} = vmsify($to); - } - @to = values %fromto; - push @m, " -EXE_FILES = @exefiles - -pure_all :: @to - \$(NOECHO) \$(NOOP) - -realclean :: -"; - - my $line = ''; - foreach $to (@to) { - if (length($line) + length($to) > 80) { - push @m, "\t\$(RM_F) $line\n"; - $line = $to; - } - else { $line .= " $to"; } - } - push @m, "\t\$(RM_F) $line\n\n" if $line; - - while (($from,$to) = each %fromto) { - last unless defined $from; - my $todir; - if ($to =~ m#[/>:\]]#) { - $todir = dirname($to); - } - else { - ($todir = $to) =~ s/[^\)]+$//; - } - $todir = $self->fixpath($todir,1); - push @m, " -$to : $from \$(FIRST_MAKEFILE) ${todir}\$(DIRFILESEP).exists - \$(CP) $from $to - -", $self->dir_target($todir); - } - join "", @m; -} - -=item subdir_x (override) - -Use VMS commands to change default directory. - -=cut - -sub subdir_x { - my($self, $subdir) = @_; - my(@m,$key); - $subdir = $self->fixpath($subdir,1); - push @m, ' - -subdirs :: - olddef = F$Environment("Default") - Set Default ',$subdir,' - - $(MMS)$(MMSQUALIFIERS) all $(USEMACROS)$(PASTHRU)$(MACROEND) - Set Default \'olddef\' -'; join('',@m); } -=item clean (override) -Split potentially long list of files across multiple commands (in -order to stay under the magic command line limit). Also use MM[SK] -commands for handling subdirectories. +=item extra_clean_files -=cut - -sub clean { - my($self, %attribs) = @_; - my(@m,$dir); - push @m, ' -# Delete temporary files but do not touch installed files. We don\'t delete -# the Descrip.MMS here so that a later make realclean still has it to use. -clean :: clean_subdirs -'; - push @m, ' $(RM_F) *.Map *.Dmp *.Lis *.cpp *.$(DLEXT) *$(OBJ_EXT) *$(LIB_EXT) *.Opt $(BOOTSTRAP) $(BASEEXT).bso .MM_Tmp -'; - - my(@otherfiles) = values %{$self->{XS}}; # .c files from *.xs files - # Unlink realclean, $attribs{FILES} is a string here; it may contain - # a list or a macro that expands to a list. - if ($attribs{FILES}) { - my @filelist = ref $attribs{FILES} eq 'ARRAY' - ? @{$attribs{FILES}} - : split /\s+/, $attribs{FILES}; - - foreach my $word (@filelist) { - if ($word =~ m#^\$\((.*)\)$# and - ref $self->{$1} eq 'ARRAY') - { - push(@otherfiles, @{$self->{$1}}); - } - else { push(@otherfiles, $word); } - } - } - push(@otherfiles, qw[ blib $(MAKE_APERL_FILE) extralibs.ld - perlmain.c pm_to_blib pm_to_blib.ts ]); - push(@otherfiles, $self->catfile('$(INST_ARCHAUTODIR)','extralibs.all')); - - # Occasionally files are repeated several times from different sources - { my(%of) = map { ($_ => 1) } @otherfiles; @otherfiles = keys %of; } - - my $line = ''; - foreach my $file (@otherfiles) { - $file = $self->fixpath($file); - if (length($line) + length($file) > 80) { - push @m, "\t\$(RM_RF) $line\n"; - $line = "$file"; - } - else { $line .= " $file"; } - } - push @m, "\t\$(RM_RF) $line\n" if $line; - push(@m, " $attribs{POSTOP}\n") if $attribs{POSTOP}; - join('', @m); -} - - -=item clean_subdirs_target - - my $make_frag = $MM->clean_subdirs_target; - -VMS semantics for changing directories and rerunning make very different. +Clean up some OS specific files. Plus the temp file used to shorten +a lot of commands. =cut -sub clean_subdirs_target { - my($self) = shift; - - # No subdirectories, no cleaning. - return <<'NOOP_FRAG' unless @{$self->{DIR}}; -clean_subdirs : - $(NOECHO) $(NOOP) -NOOP_FRAG - - - my $clean = "clean_subdirs :\n"; - - foreach my $dir (@{$self->{DIR}}) { # clean subdirectories first - $dir = $self->fixpath($dir,1); - - $clean .= sprintf <<'MAKE_FRAG', $dir, $dir; - If F$Search("%s$(FIRST_MAKEFILE)").nes."" Then $(PERLRUN) -e "chdir '%s'; print `$(MMS)$(MMSQUALIFIERS) clean`;" -MAKE_FRAG - } - - return $clean; +sub extra_clean_files { + return qw( + *.Map *.Dmp *.Lis *.cpp *.$(DLEXT) *.Opt $(BASEEXT).bso + .MM_Tmp + ); } -=item realclean (override) - -Guess what we're working around? Also, use MM[SK] for subdirectories. - -=cut - -sub realclean { - my($self, %attribs) = @_; - my(@m); - push(@m,' -# Delete temporary files (via clean) and also delete installed files -realclean :: clean -'); - foreach(@{$self->{DIR}}){ - my($vmsdir) = $self->fixpath($_,1); - push(@m, ' If F$Search("'."$vmsdir".'$(FIRST_MAKEFILE)").nes."" Then \\',"\n\t", - '$(PERL) -e "chdir ',"'$vmsdir'",'; print `$(MMS)$(MMSQUALIFIERS) realclean`;"',"\n"); - } - push @m, " \$(RM_RF) \$(INST_AUTODIR) \$(INST_ARCHAUTODIR)\n"; - push @m, " \$(RM_RF) \$(DISTVNAME)\n"; - # We can't expand several of the MMS macros here, since they don't have - # corresponding %$self keys (i.e. they're defined in Descrip.MMS as a - # combination of macros). In order to stay below DCL's 255 char limit, - # we put only 2 on a line. - my($file,$fcnt); - my(@files) = qw{ $(FIRST_MAKEFILE) $(MAKEFILE_OLD) }; - if ($self->has_link_code) { - push(@files,qw{ $(INST_DYNAMIC) $(INST_STATIC) $(INST_BOOT) $(OBJECT) }); - } - - # Occasionally files are repeated several times from different sources - { my(%f) = map { ($_,1) } @files; @files = keys %f; } - - my $line = ''; - foreach $file (@files) { - if (length($line) + length($file) > 80 || ++$fcnt >= 2) { - push @m, "\t\$(RM_F) $line\n"; - $line = "$file"; - $fcnt = 0; - } - else { $line .= " $file"; } - } - push @m, "\t\$(RM_F) $line\n" if $line; - if ($attribs{FILES}) { - my($word,$key,@filist,@allfiles); - if (ref $attribs{FILES} eq 'ARRAY') { @filist = @{$attribs{FILES}}; } - else { @filist = split /\s+/, $attribs{FILES}; } - foreach $word (@filist) { - if (($key) = $word =~ m#^\$\((.*)\)$# and ref $self->{$key} eq 'ARRAY') { - push(@allfiles, @{$self->{$key}}); - } - else { push(@allfiles, $word); } - } - $line = ''; - # Occasionally files are repeated several times from different sources - { my(%af) = map { ($_,1) } @allfiles; @allfiles = keys %af; } - foreach $file (@allfiles) { - $file = $self->fixpath($file); - if (length($line) + length($file) > 80) { - push @m, "\t\$(RM_RF) $line\n"; - $line = "$file"; - } - else { $line .= " $file"; } - } - push @m, "\t\$(RM_RF) $line\n" if $line; - } - push(@m, " $attribs{POSTOP}\n") if $attribs{POSTOP}; - join('', @m); -} - -=item zipfile_target (o) +=item zipfile_target -=item tarfile_target (o) +=item tarfile_target -=item shdist_target (o) +=item shdist_target Syntax for invoking shar, tar and zip differs from that for Unix. @@ -1460,25 +1129,6 @@ shdist : distdir MAKE_FRAG } -=item dist_test (override) - -Use VMS commands to change default directory, and use VMS-style -quoting on command line. - -=cut - -sub dist_test { - my($self) = @_; -q{ -disttest : distdir - startdir = F$Environment("Default") - Set Default [.$(DISTVNAME)] - $(ABSPERLRUN) Makefile.PL - $(MMS)$(MMSQUALIFIERS) - $(MMS)$(MMSQUALIFIERS) test - Set Default 'startdir' -}; -} # --- Test and Installation Sections --- @@ -1491,19 +1141,7 @@ VMS-style command line quoting in a few cases. sub install { my($self, %attribs) = @_; - my(@m,@exe_files); - - if ($self->{EXE_FILES}) { - my($line,$file) = ('',''); - foreach $file (@{$self->{EXE_FILES}}) { - $line .= "$file "; - if (length($line) > 128) { - push(@exe_files,qq[\t\$(NOECHO) \$(ECHO) "$line" >>.MM_tmp\n]); - $line = ''; - } - } - push(@exe_files,qq[\t\$(NOECHO) \$(ECHO) "$line" >>.MM_tmp\n]) if $line; - } + my(@m); push @m, q[ install :: all pure_install doc_install @@ -1530,13 +1168,13 @@ doc__install : doc_site_install # This hack brought to you by DCL's 255-character command line limit pure_perl_install :: $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp - $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(INSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_LIB) $(INSTALLPRIVLIB) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_ARCHLIB) $(INSTALLARCHLIB) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_BIN) $(INSTALLBIN) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_SCRIPT) $(INSTALLSCRIPT) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN1DIR) $(INSTALLMAN1DIR) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN3DIR) $(INSTALLMAN3DIR) ';" >>.MM_tmp + $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLPRIVLIB) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_BIN) $(DESTINSTALLBIN) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_SCRIPT) $(DESTINSTALLSCRIPT) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR) " >>.MM_tmp $(NOECHO) $(MOD_INSTALL) <.MM_tmp $(NOECHO) $(RM_F) .MM_tmp $(NOECHO) $(WARN_IF_OLD_PACKLIST) ].$self->catfile($self->{SITEARCHEXP},'auto',$self->{FULLEXT},'.packlist').q[ @@ -1544,56 +1182,53 @@ pure_perl_install :: # Likewise pure_site_install :: $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp - $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(INSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_LIB) $(INSTALLSITELIB) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_ARCHLIB) $(INSTALLSITEARCH) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_BIN) $(INSTALLSITEBIN) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_SCRIPT) $(INSTALLSCRIPT) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN1DIR) $(INSTALLSITEMAN1DIR) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN3DIR) $(INSTALLSITEMAN3DIR) ';" >>.MM_tmp + $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLSITELIB) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_BIN) $(DESTINSTALLSITEBIN) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_SCRIPT) $(DESTINSTALLSCRIPT) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) " >>.MM_tmp $(NOECHO) $(MOD_INSTALL) <.MM_tmp $(NOECHO) $(RM_F) .MM_tmp $(NOECHO) $(WARN_IF_OLD_PACKLIST) ].$self->catfile($self->{PERL_ARCHLIB},'auto',$self->{FULLEXT},'.packlist').q[ pure_vendor_install :: $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'read '.File::Spec->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').' '" >.MM_tmp - $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(INSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_LIB) $(INSTALLVENDORLIB) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_ARCHLIB) $(INSTALLVENDORARCH) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_BIN) $(INSTALLVENDORBIN) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_SCRIPT) $(INSTALLSCRIPT) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN1DIR) $(INSTALLVENDORMAN1DIR) ';" >>.MM_tmp - $(NOECHO) $(PERLRUN) -e "print '$(INST_MAN3DIR) $(INSTALLVENDORMAN3DIR) ';" >>.MM_tmp + $(NOECHO) $(PERLRUN) "-MFile::Spec" -e "print 'write '.File::Spec->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').' '" >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_LIB) $(DESTINSTALLVENDORLIB) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_BIN) $(DESTINSTALLVENDORBIN) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_SCRIPT) $(DESTINSTALLSCRIPT) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) " >>.MM_tmp + $(NOECHO) $(ECHO_N) "$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) " >>.MM_tmp $(NOECHO) $(MOD_INSTALL) <.MM_tmp $(NOECHO) $(RM_F) .MM_tmp # Ditto doc_perl_install :: - $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{INSTALLARCHLIB}, 'perllocal.pod').q[" - $(NOECHO) $(MKPATH) $(INSTALLARCHLIB) - $(NOECHO) $(PERLRUN) -e "print 'installed into|$(INSTALLPRIVLIB)|';" >.MM_tmp - $(NOECHO) $(PERLRUN) -e "print 'LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) ';" >>.MM_tmp -],@exe_files, -q[ $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{INSTALLARCHLIB},'perllocal.pod').q[ + $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{DESTINSTALLARCHLIB}, 'perllocal.pod').q[" + $(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) + $(NOECHO) $(ECHO_N) "installed into|$(INSTALLPRIVLIB)|" >.MM_tmp + $(NOECHO) $(ECHO_N) "LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) " >>.MM_tmp + $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{DESTINSTALLARCHLIB},'perllocal.pod').q[ $(NOECHO) $(RM_F) .MM_tmp # And again doc_site_install :: - $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{INSTALLSITEARCH}, 'perllocal.pod').q[" - $(NOECHO) $(MKPATH) $(INSTALLSITEARCH) - $(NOECHO) $(PERLRUN) -e "print 'installed into|$(INSTALLSITELIB)|';" >.MM_tmp - $(NOECHO) $(PERLRUN) -e "print 'LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) ';" >>.MM_tmp -],@exe_files, -q[ $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{INSTALLSITEARCH},'perllocal.pod').q[ + $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{DESTINSTALLARCHLIB}, 'perllocal.pod').q[" + $(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) + $(NOECHO) $(ECHO_N) "installed into|$(INSTALLSITELIB)|" >.MM_tmp + $(NOECHO) $(ECHO_N) "LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) " >>.MM_tmp + $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{DESTINSTALLARCHLIB},'perllocal.pod').q[ $(NOECHO) $(RM_F) .MM_tmp doc_vendor_install :: - $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{INSTALLVENDORARCH}, 'perllocal.pod').q[" - $(NOECHO) $(MKPATH) $(INSTALLVENDORARCH) - $(NOECHO) $(PERLRUN) -e "print 'installed into|$(INSTALLVENDORLIB)|';" >.MM_tmp - $(NOECHO) $(PERLRUN) -e "print 'LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) ';" >>.MM_tmp -],@exe_files, -q[ $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{INSTALLVENDORARCH},'perllocal.pod').q[ + $(NOECHO) $(ECHO) "Appending installation info to ].$self->catfile($self->{DESTINSTALLARCHLIB}, 'perllocal.pod').q[" + $(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) + $(NOECHO) $(ECHO_N) "installed into|$(INSTALLVENDORLIB)|" >.MM_tmp + $(NOECHO) $(ECHO_N) "LINKTYPE|$(LINKTYPE)|VERSION|$(VERSION)|EXE_FILES|$(EXE_FILES) " >>.MM_tmp + $(NOECHO) $(DOC_INSTALL) "Module" "$(NAME)" <.MM_tmp >>].$self->catfile($self->{DESTINSTALLARCHLIB},'perllocal.pod').q[ $(NOECHO) $(RM_F) .MM_tmp ]; @@ -1644,8 +1279,7 @@ $(OBJECT) : $(PERL_INC)perlsdio.h, $(PERL_INC)perlvars.h $(OBJECT) : $(PERL_INC)perly.h, $(PERL_INC)pp.h, $(PERL_INC)pp_proto.h $(OBJECT) : $(PERL_INC)proto.h, $(PERL_INC)regcomp.h, $(PERL_INC)regexp.h $(OBJECT) : $(PERL_INC)regnodes.h, $(PERL_INC)scope.h, $(PERL_INC)sv.h -$(OBJECT) : $(PERL_INC)thrdvar.h, $(PERL_INC)thread.h -$(OBJECT) : $(PERL_INC)util.h, $(PERL_INC)vmsish.h +$(OBJECT) : $(PERL_INC)thread.h, $(PERL_INC)util.h, $(PERL_INC)vmsish.h ' if $self->{OBJECT}; @@ -1687,108 +1321,6 @@ $(PERL_ARCHLIB)Config.pm : $(PERL_SRC)config.sh join('',@m); } -=item makefile (override) - -Use VMS commands and quoting. - -=cut - -sub makefile { - my($self) = @_; - my(@m,@cmd); - # We do not know what target was originally specified so we - # must force a manual rerun to be sure. But as it should only - # happen very rarely it is not a significant problem. - push @m, q[ -$(OBJECT) : $(FIRST_MAKEFILE) -] if $self->{OBJECT}; - - push @m,q[ -# We take a very conservative approach here, but it\'s worth it. -# We move $(FIRST_MAKEFILE) to $(MAKEFILE_OLD) here to avoid gnu make looping. -$(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP) - $(NOECHO) $(ECHO) "$(FIRST_MAKEFILE) out-of-date with respect to $(MMS$SOURCE_LIST)" - $(NOECHO) $(ECHO) "Cleaning current config before rebuilding $(FIRST_MAKEFILE) ..." - - $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) - - $(MMS)$(MMSQUALIFIERS) $(USEMAKEFILE)$(MAKEFILE_OLD) clean - $(PERLRUN) Makefile.PL ],join(' ',map(qq["$_"],@ARGV)),q[ - $(NOECHO) $(ECHO) "$(FIRST_MAKEFILE) has been rebuilt." - $(NOECHO) $(ECHO) "Please run $(MMS) to build the extension." -]; - - join('',@m); -} - -=item find_tests (override) - -=cut - -sub find_tests { - my $self = shift; - return -d 't' ? 't/*.t' : ''; -} - -=item test (override) - -Use VMS commands for handling subdirectories. - -=cut - -sub test { - my($self, %attribs) = @_; - my($tests) = $attribs{TESTS} || $self->find_tests; - my(@m); - push @m," -TEST_VERBOSE = 0 -TEST_TYPE = test_\$(LINKTYPE) -TEST_FILE = test.pl -TESTDB_SW = -d - -test :: \$(TEST_TYPE) - \$(NOECHO) \$(NOOP) - -testdb :: testdb_\$(LINKTYPE) - \$(NOECHO) \$(NOOP) - -"; - foreach(@{$self->{DIR}}){ - my($vmsdir) = $self->fixpath($_,1); - push(@m, ' If F$Search("',$vmsdir,'$(FIRST_MAKEFILE)").nes."" Then $(PERL) -e "chdir ',"'$vmsdir'", - '; print `$(MMS)$(MMSQUALIFIERS) $(PASTHRU2) test`'."\n"); - } - push(@m, "\t\$(NOECHO) \$(ECHO) \"No tests defined for \$(NAME) extension.\"\n") - unless $tests or -f "test.pl" or @{$self->{DIR}}; - push(@m, "\n"); - - push(@m, "test_dynamic :: pure_all\n"); - push(@m, $self->test_via_harness('$(FULLPERLRUN)', $tests)) if $tests; - push(@m, $self->test_via_script('$(FULLPERLRUN)', 'test.pl')) if -f "test.pl"; - push(@m, "\t\$(NOECHO) \$(NOOP)\n") if (!$tests && ! -f "test.pl"); - push(@m, "\n"); - - push(@m, "testdb_dynamic :: pure_all\n"); - push(@m, $self->test_via_script('$(FULLPERLRUN) "$(TESTDB_SW)"', '$(TEST_FILE)')); - push(@m, "\n"); - - # Occasionally we may face this degenerate target: - push @m, "test_ : test_dynamic\n\n"; - - if ($self->needs_linking()) { - push(@m, "test_static :: pure_all \$(MAP_TARGET)\n"); - push(@m, $self->test_via_harness('$(MAP_TARGET)', $tests)) if $tests; - push(@m, $self->test_via_script('$(MAP_TARGET)', 'test.pl')) if -f 'test.pl'; - push(@m, "\n"); - push(@m, "testdb_static :: pure_all \$(MAP_TARGET)\n"); - push(@m, $self->test_via_script('$(MAP_TARGET) $(TESTDB_SW)', '$(TEST_FILE)')); - push(@m, "\n"); - } - else { - push @m, "test_static :: test_dynamic\n\t\$(NOECHO) \$(NOOP)\n\n"; - push @m, "testdb_static :: testdb_dynamic\n\t\$(NOECHO) \$(NOOP)\n"; - } - - join('',@m); -} =item makeaperl (override) @@ -1826,7 +1358,7 @@ $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) push @m, map(q[ \\\n\t\t"$_"], @ARGV),q{ $(MAP_TARGET) :: $(MAKE_APERL_FILE) - $(MMS)$(MMSQUALIFIERS)$(USEMAKEFILE)$(MAKE_APERL_FILE) static $(MMS$TARGET) + $(MAKE)$(USEMAKEFILE)$(MAKE_APERL_FILE) static $(MMS$TARGET) }; push @m, "\n"; @@ -1994,9 +1526,9 @@ $(MAP_SHRTARGET) : $(MAP_LIBPERL) Makeaperl.Opt ',"${libperldir}Perlshr_Attr.Opt $(MAP_TARGET) : $(MAP_SHRTARGET) ',"${tmpdir}perlmain\$(OBJ_EXT) ${tmpdir}PerlShr.Opt",' $(MAP_LINKCMD) ',"${tmpdir}perlmain\$(OBJ_EXT)",', PerlShr.Opt/Option $(NOECHO) $(ECHO) "To install the new ""$(MAP_TARGET)"" binary, say" - $(NOECHO) $(ECHO) " $(MMS)$(MMSQUALIFIERS)$(USEMAKEFILE)$(FIRST_MAKEFILE) inst_perl $(USEMACROS)MAP_TARGET=$(MAP_TARGET)$(ENDMACRO)" + $(NOECHO) $(ECHO) " $(MAKE)$(USEMAKEFILE)$(FIRST_MAKEFILE) inst_perl $(USEMACROS)MAP_TARGET=$(MAP_TARGET)$(ENDMACRO)" $(NOECHO) $(ECHO) "To remove the intermediate files, say - $(NOECHO) $(ECHO) " $(MMS)$(MMSQUALIFIERS)$(USEMAKEFILE)$(FIRST_MAKEFILE) map_clean" + $(NOECHO) $(ECHO) " $(MAKE)$(USEMAKEFILE)$(FIRST_MAKEFILE) map_clean" '; push @m,"\n${tmpdir}perlmain.c : \$(FIRST_MAKEFILE)\n\t\$(NOECHO) \$(PERL) -e 1 >${tmpdir}Writemain.tmp\n"; push @m, "# More from the 255-char line length limit\n"; @@ -2012,11 +1544,12 @@ MAKE_FRAG push @m, q[ # Still more from the 255-char line length limit doc_inst_perl : + $(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) $(NOECHO) $(ECHO) "Perl binary $(MAP_TARGET)|" >.MM_tmp $(NOECHO) $(ECHO) "MAP_STATIC|$(MAP_STATIC)|" >>.MM_tmp $(NOECHO) $(PERL) -pl040 -e " " ].$self->catfile('$(INST_ARCHAUTODIR)','extralibs.all'),q[ >>.MM_tmp $(NOECHO) $(ECHO) -e "MAP_LIBPERL|$(MAP_LIBPERL)|" >>.MM_tmp - $(NOECHO) $(DOC_INSTALL) <.MM_tmp >>].$self->catfile('$(INSTALLARCHLIB)','perllocal.pod').q[ + $(NOECHO) $(DOC_INSTALL) <.MM_tmp >>].$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q[ $(NOECHO) $(RM_F) .MM_tmp ]; @@ -2079,18 +1612,23 @@ sub prefixify { # Translate $(PERLPREFIX) to a real path. $rprefix = $self->eliminate_macros($rprefix); $rprefix = VMS::Filespec::vmspath($rprefix) if $rprefix; + $sprefix = VMS::Filespec::vmspath($sprefix) if $sprefix; $default = VMS::Filespec::vmsify($default) unless $default =~ /\[.*\]/; (my $var_no_install = $var) =~ s/^install//; - my $path = $self->{uc $var} || $Config{lc $var} || - $Config{lc $var_no_install}; + my $path = $self->{uc $var} || + $ExtUtils::MM_Unix::Config_Override{lc $var} || + $Config{lc $var} || $Config{lc $var_no_install}; if( !$path ) { print STDERR " no Config found for $var.\n" if $Verbose >= 2; $path = $self->_prefixify_default($rprefix, $default); } + elsif( !$self->{ARGS}{PREFIX} || !$self->file_name_is_absolute($path) ) { + # do nothing if there's no prefix or if its relative + } elsif( $sprefix eq $rprefix ) { print STDERR " no new prefix.\n" if $Verbose >= 2; } @@ -2149,7 +1687,33 @@ sub _catprefix { } -=item oneliner (o) +=item cd + +=cut + +sub cd { + my($self, $dir, @cmds) = @_; + + $dir = vmspath($dir); + + my $cmd = join "\n\t", map "$_", @cmds; + + # No leading tab makes it look right when embedded + my $make_frag = sprintf <<'MAKE_FRAG', $dir, $cmd; +startdir = F$Environment("Default") + Set Default %s + %s + Set Default 'startdir' +MAKE_FRAG + + # No trailing newline makes this easier to embed + chomp $make_frag; + + return $make_frag; +} + + +=item oneliner =cut @@ -2167,11 +1731,11 @@ sub oneliner { # Switches must be quoted else they will be lowercased. $switches = join ' ', map { qq{"$_"} } @$switches; - return qq{\$(PERLRUN) $switches -e $cmd}; + return qq{\$(ABSPERLRUN) $switches -e $cmd "--"}; } -=item B (o) +=item B perl trips up on "" thinking it's an input redirect. So we use the native Write command instead. Besides, its faster. @@ -2229,7 +1793,7 @@ sub max_exec_len { return $self->{_MAX_EXEC_LEN} ||= 256; } -=item init_linker (o) +=item init_linker =cut @@ -2302,17 +1866,20 @@ sub eliminate_macros { =item fixpath + my $path = $mm->fixpath($path); + my $path = $mm->fixpath($path, $is_dir); + Catchall routine to clean up problem MM[SK]/Make macros. Expands macros in any directory specification, in order to avoid juxtaposing two VMS-syntax directories when MM[SK] is run. Also expands expressions which are all macro, so that we can tell how long the expansion is, and avoid overrunning DCL's command buffer when MM[KS] is running. -If optional second argument has a TRUE value, then the return string is -a VMS-syntax directory specification, if it is FALSE, the return string -is a VMS-syntax file specification, and if it is not specified, fixpath() -checks to see whether it matches the name of a directory in the current -default directory, and returns a directory or file specification accordingly. +fixpath() checks to see whether the result matches the name of a +directory in the current default directory and returns a directory or +file specification accordingly. C<$is_dir> can be set to true to +force fixpath() to consider the path to be a directory or false to force +it to be a file. NOTE: This is the canonical version of the method. The version in File::Spec::VMS is deprecated. @@ -2325,10 +1892,10 @@ sub fixpath { $self = bless {} unless ref $self; my($fixedpath,$prefix,$name); - if ($path =~ /\s/) { + if ($path =~ /[ \t]/) { return join ' ', map { $self->fixpath($_,$force_path) } - split /\s+/, $path; + split /[ \t]+/, $path; } if ($path =~ m#^\$\([^\)]+\)\Z(?!\n)#s || $path =~ m#[/:>\]]#) { @@ -2379,6 +1946,16 @@ sub os_flavor { =back + +=head1 AUTHOR + +Original author Charles Bailey F + +Maintained by Michael G Schwern F + +See L for patching and contact information. + + =cut 1;