In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/52f75a8770b4af0ffa1a094cc15d77f1ede582df?hp=c1413a7f3faf8fb1e44dd192e26d2ae52b8817ce>
- Log ----------------------------------------------------------------- commit 52f75a8770b4af0ffa1a094cc15d77f1ede582df Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri May 8 12:50:33 2009 +0200 Upgrade CPANPLUS::Dist::Build to 0.28 M MANIFEST M lib/CPANPLUS/Dist/Build.pm M lib/CPANPLUS/Dist/Build/Constants.pm M lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed M lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed M lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed A lib/CPANPLUS/Dist/Build/t/dummy-perl/.hidden M lib/CPANPLUS/Dist/Build/t/inc/conf.pl M lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed M lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed commit 1e3c652eb4151e62b641752816e9f1039df3703a Author: Chris 'BinGOs' Williams <[email protected]> Date: Fri May 8 12:49:40 2009 +0200 git checkout in add-package.pl, not git co M Porting/add-package.pl ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + Porting/add-package.pl | 2 +- lib/CPANPLUS/Dist/Build.pm | 2 +- lib/CPANPLUS/Dist/Build/Constants.pm | 2 +- .../t/dummy-CPAN/authors/01mailrc.txt.gz.packed | 6 +- .../modules/02packages.details.txt.gz.packed | 6 +- .../t/dummy-CPAN/modules/03modlist.data.gz.packed | 46 +++++++------------- .../CPANPLUS/Dist/Build/t/dummy-perl/.hidden | 0 lib/CPANPLUS/Dist/Build/t/inc/conf.pl | 13 +++-- .../Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed | 2 +- .../Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed | 2 +- 11 files changed, 36 insertions(+), 46 deletions(-) mode change 100644 => 100755 MANIFEST copy ext/Module-Pluggable/t/lib/Zot/.Zork.pm => lib/CPANPLUS/Dist/Build/t/dummy-perl/.hidden (100%) diff --git a/MANIFEST b/MANIFEST old mode 100644 new mode 100755 index d4a0c15..f9dc7e6 --- a/MANIFEST +++ b/MANIFEST @@ -1940,6 +1940,7 @@ lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t CPANPLUS::Dist::Build tests lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed +lib/CPANPLUS/Dist/Build/t/dummy-perl/.hidden CPANPLUS::Dist::Build tests lib/CPANPLUS/Dist/Build/t/inc/conf.pl CPANPLUS::Dist::Build tests lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed CPANPLUS::Dist::Build tests lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed CPANPLUS::Dist::Build tests diff --git a/Porting/add-package.pl b/Porting/add-package.pl index 54a4f03..c8fe807 100644 --- a/Porting/add-package.pl +++ b/Porting/add-package.pl @@ -55,7 +55,7 @@ else { unless ( $status =~ /nothing to commit/ims ) { die "\nWorking directory not clean. Stopping.\n"; } - system( "git co -b $BranchName blead" ) + system( "git checkout -b $BranchName blead" ) and die "Could not create branch '$BranchName': $?"; print "done\n" if $Verbose; diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm index 4d4f7fc..8663a64 100644 --- a/lib/CPANPLUS/Dist/Build.pm +++ b/lib/CPANPLUS/Dist/Build.pm @@ -30,7 +30,7 @@ use Locale::Maketext::Simple Class => 'CPANPLUS', Style => 'gettext'; local $Params::Check::VERBOSE = 1; -$VERSION = '0.26'; +$VERSION = '0.28'; =pod diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm index fba2f9a..99246c0 100644 --- a/lib/CPANPLUS/Dist/Build/Constants.pm +++ b/lib/CPANPLUS/Dist/Build/Constants.pm @@ -9,7 +9,7 @@ BEGIN { require Exporter; use vars qw[$VERSION @ISA @EXPORT]; - $VERSION = '0.26'; + $VERSION = '0.28'; @ISA = qw[Exporter]; @EXPORT = qw[ BUILD_DIR BUILD ]; } diff --git a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed index 0deb147..21fa325 100644 --- a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed @@ -4,13 +4,13 @@ is included in the Perl distribution. To unpack this file use the following command: - uupacktool.pl -u 01mailrc.txt.gz.packed 01mailrc.txt.gz + uupacktool.pl -u lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz To recreate it use the following command: - uupacktool.pl -p 01mailrc.txt.gz 01mailrc.txt.gz.packed + uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz lib/CPANPLUS/Dist/Build/t/dummy-CPAN/authors/01mailrc.txt.gz.packed -Created at Thu May 7 17:18:27 2009 +Created at Fri May 8 11:07:40 2009 ######################################################################### __UU__ M'XL("*':`DH``S`Q;6%I;')C+G1X=`!+S,E,+%9P#8T(5...@`#)=>*DM"2S)QB diff --git a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed index e9bab39..1b8f742 100644 --- a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed @@ -4,13 +4,13 @@ is included in the Perl distribution. To unpack this file use the following command: - uupacktool.pl -u 02packages.details.txt.gz.packed 02packages.details.txt.gz + uupacktool.pl -u lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz To recreate it use the following command: - uupacktool.pl -p 02packages.details.txt.gz 02packages.details.txt.gz.packed + uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/02packages.details.txt.gz.packed -Created at Thu May 7 17:19:10 2009 +Created at Fri May 8 11:07:41 2009 ######################################################################### __UU__ M'XL("-3:`DH``S`R<&%C:V%G97,N9&5T86EL<RYT>'0`G=-!;]...@%`?p<_PI diff --git a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed index 556b9dc..0f36b60 100644 --- a/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed @@ -4,39 +4,25 @@ is included in the Perl distribution. To unpack this file use the following command: - uupacktool.pl -u 03modlist.data.gz.packed 03modlist.data.gz + uupacktool.pl -u lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz To recreate it use the following command: - uupacktool.pl -p 03modlist.data.gz 03modlist.data.gz.packed + uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz lib/CPANPLUS/Dist/Build/t/dummy-CPAN/modules/03modlist.data.gz.packed -Created at Thu May 7 17:19:15 2009 +Created at Fri May 8 11:07:41 2009 ######################################################################### __UU__ -M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C -M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(PI4:&ES(&ES(&$...@8fen87)Y -M(&9I;&4...@=&AA="!W87,@<&%C:V5D('=I=&@@=&AE("=U=7!A8VMT;V]L+G!L -M)R!W:&EC:`II<R!I;F-L=61E9"!I;B!T:&4...@4&5R;"!D:7-T<FEB=71I;VXN -M"@I4;R!U;g!a...@=&AI<R!F:6QE('5S92!T:&4...@9f]l;&]W:6YG(&-O;6UA -M;F0Z"@H@("`@('5U<&%C:W1O;VPN<&p...@+74@,#-M;V1L:7-T+F1A=&$N9WH@ -M,#)P86-K86=E<RYD971A:6QS+G1X="YG>@H*5&\@<F5C<F5A=&4@:7...@=7-e -M('1H92!F;VQL;W=I;F<@8V]M;6%N9#H*"B`@("`...@=75p86-k=&]O;"YP;"`M -M<"`P,G!A8VMA9V5S+F1E=&%I;',N='AT+F=Z(#`S;6]D;&ES="YD871A+F=Z -M"@I#<F5A=&5D(&%T(%1H=2!-87D@(#<@,3<Z,3...@z-3@@,C`P.0HC(R,C(R,C -M(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C(R,C -M(R,C(R,C(R,C(R,C(R,C(R,C(R,C"E]?555?7PI-)UA,*"(M,s...@1$a@8%-@ -M4CPF)4,Z5B5'.3<L3CDF-50X-D5,/%)95#XG,&!'/2TA.UU,0"5@/U`\7U!) -M"DU71B8G,S!*."Y+*$H\-4H\*44V5RDH5C8V/[email protected]<)5!/7E\R -M(SDE5SLZ+4<v*#1...@l7b\*32%8*ce+038g45pz4c5%,3]1-#E9*D$T*C<W -M3BI74V!)+UQ6/RQ+(24[)T8Z74=5+S9>-4HV341&1SI3)@I-4ELR44Q*3C4S -M5%Q()5Q)-S-+/DA+,$<Z6D%@(2A12T58/5E6,4...@h5b@K-3,E-4I70%,]6S17 -M,EA-/%I'"DTV2CLI42TY/3A?4R\T34E'4"%@/D4O+"$G2#E.5R(Y-R%)-C$R -M22HY/3%3)B<]229(*2E02ULC.D!++#T*33I*+UQ<*R%80"$Q*#97-BTL0D%" -M/C,R63PQ2",P.$D]-RI624D_.SA"4T-96S`M1#TL,E(]5R)70%LF,0I-,T!% -M+R]5245=+CI=+"M(,3...@\7rdo+r%$)$\Z)#P_2#DN7%]3.2)87$1+*C5,,6`N -M+51(+...@\,T!`4R(P"dt...@a4e=$-d]'+...@w)U$N1$E&54<A/R(\,UA-+CM= -M/5!5)4-%*5<E7ULR7#<Z/$$S)"HV421:*E!-)RT*35U6/V!(3T`S3")#7B(U -M03XG42TO,"%36R)1)%<\.4HX14I<0"XE75<]7UTC)RE?8"I80$(W+%M0,R]` -M20I-6DA`6%$L1T]))$1/,UTV43M=12LJ.UI/1R,J-C]6)D,W5#%8)4I-628P -M6T(H15,J-"1>1SI31#A1)30F"CE1/3=27$=*/2]...@s*2%=6"0T-2]08%]( -,*SLB73`L8&!...@8&`* +M'XL("#'FO$4``S`S;6]D;&ES="YD871A`%U3_6O;,!#].?HKCBXC"20A=<@& +M"@OIYV!;/Z`-&V1E*/:U%I4M(\D-)N1_WTFVFVS&H.=W>N^>SO:U5,BAN2;3 +M3"=*6C=.A!/L$FUL9.&dscd...@1a$%p*8*o$q`n,$6Y(56*"<@\E,FF5,@Z +MWFL(F])YMH),5+#Q5=(8C#'w...@e2cbt#@IM'2:L4SN$+'#WA@:<S!"VV%.* +M;%X1;!FBB&!MZT2L$Y,;=...@m97$:"B-##U*F6E%08>AQJT$_>_;?-A>E,11) +M5522%NC.=2V.A<4QN]%)K,O<A7%%T]F,_332.<Q'YQ5QF4K(9BM<G$+_#:+Q +M=!(-8%/!69X8%';\76,N7Y8BEYD8)\...@nz<3OH[\V<@C1#+[1`:+))(+))QY] +MYI,I?+UY9,QO*43\*EX0+N[/;CF_>4\^#]4/L+)4Y<V9R5QP?EEF!9K1(L=M +M?_V_;K3P,WL:C!9^&v...@#5f92"1/\;+FIW_*.U0FS"KH&;:D<?('=?GY$4\M, +MF(KX$QJH3$[:XC.9]I==[S/8T;0K^)@*F\Y99^G7W;(;:V7W)%QV_Q#;-...@m +M=MU0;YWW?LOO1EM;[YNUD<SK&>T9"Y:t?4u$+\3i#3v...@c:`]0':`\P**& +MR>$GJ`GZMDSK&:>B<.&1/5&"<-"F]3KDZ5UKS?FY,)Q?K3B_O?OU$)1>VX*D +K!44+[EK0KO[5W?]8/<"C_T?NZP^A+5ZMCFU/3WL$GH8^T%]3O>X%W0,````` diff --git a/ext/Module-Pluggable/t/lib/Zot/.Zork.pm b/lib/CPANPLUS/Dist/Build/t/dummy-perl/.hidden similarity index 100% copy from ext/Module-Pluggable/t/lib/Zot/.Zork.pm copy to lib/CPANPLUS/Dist/Build/t/dummy-perl/.hidden diff --git a/lib/CPANPLUS/Dist/Build/t/inc/conf.pl b/lib/CPANPLUS/Dist/Build/t/inc/conf.pl index c884fd8..e4bca17 100644 --- a/lib/CPANPLUS/Dist/Build/t/inc/conf.pl +++ b/lib/CPANPLUS/Dist/Build/t/inc/conf.pl @@ -27,11 +27,14 @@ BEGIN { $ENV{'PERL5LIB'} = join $Config{'path_sep'}, grep { defined } $ENV{'PERL5LIB'}, @paths, @rel2abs; - ### add our own path to the front of $ENV{PATH}, so that cpanp-run-perl - ### and friends get picked up - $old_env_path = $ENV{PATH}; - $ENV{'PATH'} = join $Config{'path_sep'}, - grep { defined } "$FindBin::Bin/../bin", $ENV{'PATH'}; + ### add CPANPLUS' bin dir to the front of $ENV{PATH}, so that cpanp-run-perl + ### and friends get picked up, only under PERL_CORE though. + if ( $ENV{PERL_CORE} ) { + $old_env_path = $ENV{PATH}; + $ENV{'PATH'} = join $Config{'path_sep'}, + grep { defined } "$FindBin::Bin/../../../bin", $ENV{'PATH'}; + + } ### Fix up the path to perl, as we're about to chdir ### but only under perlcore, or if the path contains delimiters, diff --git a/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed index 26020e9..073d01c 100644 --- a/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed @@ -10,7 +10,7 @@ To recreate it use the following command: uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz lib/CPANPLUS/Dist/Build/t/src/noxs/Foo-Bar-0.01.tar.gz.packed -Created at Fri Nov 9 13:38:49 2007 +Created at Fri May 8 11:07:40 2009 ######################################################################### __UU__ M'XL("-<X34(``T9O;RU"87(M,"XP,2YT87(`[9E;;]HP%,=Y]J<x+9...@-r diff --git a/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed b/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed index 30ab433..663cc45 100644 --- a/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed +++ b/lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed @@ -10,7 +10,7 @@ To recreate it use the following command: uupacktool.pl -p lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz lib/CPANPLUS/Dist/Build/t/src/xs/Foo-Bar-0.01.tar.gz.packed -Created at Fri Nov 9 13:38:49 2007 +Created at Fri May 8 11:07:40 2009 ######################################################################### __UU__ M'XL("-\X34(``T9O;RU"87(M,"XP,2YT87(`[5K_3QI)%/=7YZ]XU39H(BN[ -- Perl5 Master Repository
