diff options
author | Perl 5 Porters <perl5-porters@africa.nicoh.com> | 1997-03-22 15:34:25 +1200 |
---|---|---|
committer | Chip Salzenberg <chip@atlantic.net> | 1997-03-22 15:34:25 +1200 |
commit | 3fe9a6f19eb206c685bd7389e54e2838fdfd04b7 (patch) | |
tree | 94845bcda5f58956e6c9ccef24340d1b5c93d182 /lib/ExtUtils/Command.pm | |
parent | 9a2c4ce3a0904191a580ec822adeb696331d31ce (diff) | |
download | perl-3fe9a6f19eb206c685bd7389e54e2838fdfd04b7.tar.gz |
[inseparable changes from match from perl-5.003_94 to perl-5.003_95]
CORE LANGUAGE CHANGES
Subject: Don't compile scalar mods of aggregates, like C<@a =~ s/a/b/>
From: Chip Salzenberg <chip@perl.com>
Files: op.c t/op/misc.t
Subject: Warn about undef magic values just like non-magic
From: Chip Salzenberg <chip@perl.com>
Files: ext/Opcode/Safe.pm sv.c t/lib/db-btree.t t/lib/db-hash.t t/lib/db-recno.t t/pragma/locale.t
CORE PORTABILITY
Subject: Win32 update (five patches)
From: Gurusamy Sarathy <gsar@engin.umich.edu>
Files: MANIFEST README.win32 doio.c dosish.h pp_sys.c lib/ExtUtils/Command.pm t/comp/multiline.t t/op/magic.t t/op/mkdir.t t/op/runlevel.t t/op/stat.t t/op/write.t win32/Makefile win32/config.H win32/config.w32 win32/win32.c win32/win32.h win32/win32aux.c win32/*.mak win32/VC-2.0/*.mak
DOCUMENTATION
Subject: INSTALL-1.8 to INSTALL-1.9 updates
Date: Tue, 25 Mar 1997 13:52:53 -0500 (EST)
From: Andy Dougherty <doughera@fractal.phys.lafayette.edu>
Files: INSTALL
Msg-ID: Pine.SOL.3.95q.970325135138.3374A-100000@fractal.lafayette.e
(applied based on p5p patch as commit 9b1ae96a0b4301a9588f62b3175bc0312302f4b9)
Subject: Document possible problems with -Mdiagnostics after upgrade
From: Chip Salzenberg <chip@perl.com>
Files: INSTALL
Subject: Mention perldelta in INSTALL
From: Chip Salzenberg <chip@perl.com>
Files: INSTALL
Subject: Describe pod format at top of INSTALL
From: Chip Salzenberg <chip@perl.com>
Files: INSTALL
Subject: Document C</a *b/x> fix
From: Chip Salzenberg <chip@perl.com>
Files: pod/perldelta.pod
Subject: pods for subroutine argument autovivication
Date: Mon, 24 Mar 1997 07:25:21 +0000
From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>
Files: pod/perldelta.pod pod/perlsub.pod
Msg-ID: E0w9489-0005YT-00@ursa.cus.cam.ac.uk
(applied based on p5p patch as commit db8878faa51a8a1541a40745a8613adb5db155e4)
Subject: Missing item in perldiag
Date: Sun, 23 Mar 1997 09:24:09 +0000
From: "M.J.T. Guy" <mjtg@cus.cam.ac.uk>
Files: pod/perldiag.pod
Msg-ID: E0w8jVZ-0005va-00@ursa.cus.cam.ac.uk
(applied based on p5p patch as commit c00a529017138505fcbe538b74c7884abe1d18e1)
Subject: Pod problems & fixes
Date: Mon, 24 Mar 1997 21:31:51 +0100 (MET)
From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
Files: INSTALL lib/Term/Complete.pm lib/subs.pm pod/perlcall.pod pod/perldata.pod pod/perldiag.pod pod/perlembed.pod pod/perlguts.pod pod/perlmod.pod pod/perlop.pod pod/perlpod.pod pod/pod2html.PL
Msg-ID: 199703242031.VAA14997@bombur2.uio.no
(applied based on p5p patch as commit 55a864fe4cea1a0586891b83d359ba71e0972da5)
Subject: FAQ update
From: Nathan Torkington <gnat@prometheus.frii.com>
Files: pod/perlfaq*.pod
OTHER CORE CHANGES
Subject: Improve 'prototype mismatch' warning
From: Chip Salzenberg <chip@perl.com>
Files: global.sym op.c pod/perldiag.pod proto.h sv.c t/comp/redef.t
Diffstat (limited to 'lib/ExtUtils/Command.pm')
-rw-r--r-- | lib/ExtUtils/Command.pm | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/lib/ExtUtils/Command.pm b/lib/ExtUtils/Command.pm index 8c4fd7a916..7bdbea9dd7 100644 --- a/lib/ExtUtils/Command.pm +++ b/lib/ExtUtils/Command.pm @@ -1,6 +1,7 @@ package ExtUtils::Command; use strict; # use AutoLoader; +use Carp; use File::Copy; use File::Compare; use File::Basename; @@ -35,14 +36,22 @@ Most commands are wrapers on generic modules File::Path and File::Basename. =over 4 +=cut + +sub expand_wildcards +{ + @ARGV = map(/[\*\?]/ ? glob($_) : $_,@ARGV); +} + =item cat -Concatenates all files menthion on command line to STDOUT. +Concatenates all files mentioned on command line to STDOUT. =cut sub cat () { + expand_wildcards(); print while (<>); } @@ -68,7 +77,7 @@ Removes directories - recursively (even if readonly) sub rm_rf { - rmtree([@ARGV],0,0); + rmtree([grep -e $_,expand_wildcards()],0,0); } =item rm_f files.... @@ -79,12 +88,13 @@ Removes files (even if readonly) sub rm_f { - foreach (@ARGV) + foreach (expand_wildcards()) { - next unless -e $_; - chmod(0777,$_); - next if (-f $_ and unlink($_)); - die "Cannot delete $_:$!"; + next unless -f $_; + next if unlink($_); + chmod(0777,$_); + next if unlink($_); + carp "Cannot delete $_:$!"; } } @@ -96,6 +106,7 @@ Makes files exist, with current timestamp sub touch { + expand_wildcards(); while (@ARGV) { my $file = shift(@ARGV); @@ -114,19 +125,12 @@ Multiple sources are allowed if destination is an existing directory. sub mv { my $dst = pop(@ARGV); - if (-d $dst) - { - while (@ARGV) - { - my $src = shift(@ARGV); - my $leaf = basename($src); - move($src,"$dst/$leaf"); # fixme - } - } - else + expand_wildcards(); + croak("Too many arguments") if (@ARGV > 1 && ! -d $dst); + while (@ARGV) { - my $src = shift(@ARGV); - move($src,$dst) || die "Cannot move $src $dst:$!"; + my $src = shift(@ARGV); + move($src,$dst); } } @@ -140,18 +144,12 @@ Multiple sources are allowed if destination is an existing directory. sub cp { my $dst = pop(@ARGV); - if (-d $dst) - { - while (@ARGV) - { - my $src = shift(@ARGV); - my $leaf = basename($src); - copy($src,"$dst/$leaf"); # fixme - } - } - else + expand_wildcards(); + croak("Too many arguments") if (@ARGV > 1 && ! -d $dst); + while (@ARGV) { - copy(shift,$dst); + my $src = shift(@ARGV); + copy($src,$dst); } } @@ -163,7 +161,8 @@ Sets UNIX like permissions 'mode' on all the files. sub chmod { - chmod(@ARGV) || die "Cannot chmod ".join(' ',@ARGV).":$!"; + my $mode = shift(@ARGV); + chmod($mode,expand_wildcards()) || die "Cannot chmod ".join(' ',$mode,@ARGV).":$!"; } =item mkpath directory... @@ -174,7 +173,7 @@ Creates directory, including any parent directories. sub mkpath { - File::Path::mkpath([@ARGV],1,0777); + File::Path::mkpath([expand_wildcards()],1,0777); } =item test_f file @@ -195,9 +194,6 @@ __END__ =head1 BUGS -eqtime does not work right on Win32 due to problems with utime() built-in -command. - Should probably be Auto/Self loaded. =head1 SEE ALSO |