开源软件构建与测试

_service:tar_scm:perl-ExtUtils-MakeMaker.spec Changed

_service Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/Changes -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/Changes Changed

@@ -1,3 +1,119 @@
+7.70    Sun 26 Mar 14:13:20 BST 2023
+
+    No changes since v7.69_01
+
+7.69_01 Sat 25 Mar 11:06:19 GMT 2023
+
+    Core reversions:
+    - Reverted the PERL_CORE and PERL_SRC changes from v7.67_02
+      These will be reintroduced after more testing in core
+
+7.68    Tue 14 Mar 21:38:00 GMT 2023
+
+    No changes since v7.67_02
+
+7.67_02 Mon  6 Mar 10:53:22 GMT 2023
+
+    Core fixes:
+    - initialize PERL_CORE object var early and use it consistently
+    - only search for PERL_SRC when PERL_CORE is true or unset
+
+    Clean-ups:
+    - remove use vars from non-bundled modules
+    - remove unused _find_magic_vstring function
+
+7.67_01 Wed  1 Mar 12:38:00 GMT 2023
+
+    Bug fixes:
+    - Treat MidnightBSD as a BSD
+    - fix MIN_PERL_VERSION for perl versions with underscores
+
+    Test fixes:
+    -  t/.../More.pm - remove isn't: apostrophe as a package sep is deprecated
+
+7.66    Sun 25 Dec 08:47:54 GMT 2022
+
+    No changes since v7.65_03
+
+7.65_03 Sat 24 Dec 00:14:35 GMT 2022
+
+    Bug fixes:
+    - Reverted "Return hint file loading to quoted eval" introduced with
+      v7.47_11
+    - Implement tempdir() logic for parallel tests
+
+7.65_02 Fri 22 Jul 13:44:57 BST 2022
+
+    Bug fixes:
+    - Don't use rpath for macOS <= 10.4
+    - Only include existent directories in libpath
+    - Silence spurious warning when a postamble returns undef
+
+7.65_01 Mon 30 May 10:44:31 BST 2022
+
+    Doc fixes:
+    - use Test::More rather than Test.pm in FAQ example
+    - fix typos using WriteMakeFile rather than WriteMakefile
+
+7.64  Fri 17 Dec 15:35:46 GMT 2021
+
+    No changes since v7.63_11
+
+7.63_11 Tue 14 Dec 16:00:11 GMT 2021
+
+    OS390 fixes:
+    - Extend prereqs sort to work on EBCDIC
+
+7.63_10 Mon 13 Dec 16:26:49 GMT 2021
+
+    OS390 fixes:
+    - Fix dynamic loading
+
+7.63_09 Wed  8 Dec 22:20:53 GMT 2021
+
+    Enhancements:
+    - Don't use canned libpth values
+
+7.63_08 Sat 27 Nov 17:28:03 GMT 2021
+
+    Correction:
+    - Previous change to ${LDFLAGS) was reverted
+
+7.63_07 Sat 27 Nov 11:34:12 GMT 2021
+
+    Enhancements:
+    - Add $(LDFLAGS) when linking binary modules
+
+7.63_06 Wed  3 Nov 01:24:05 GMT 2021
+
+    Bug fixes:
+    - Add -rpath when compiling XS modules on macOS
+
+7.63_05 Sat 14 Aug 09:04:08 BST 2021
+
+    Enhancements:
+    - Added CPPRUN variable
+
+7.63_04 Wed 30 Jun 15:15:01 BST 2021
+
+    Doc fixes:
+    - Describe CCFLAGS’ default
+
+7.63_03 Tue 22 Jun 14:39:32 BST 2021
+
+    OS390 Enhancements:
+    - Fix override xs_make_dynamic_lib() for os390
+
+7.63_02 Thu  3 Jun 19:52:03 BST 2021
+
+    Doc fixes:
+    - Changed wording for POLLUTE
+
+7.63_01 Tue 25 May 16:22:50 BST 2021
+
+    Bug fixes:
+    - Comparing inodes numerically is unsafe
+
 7.62    Tue 13 Apr 18:58:24 BST 2021
 
     No changes since v7.61_01

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/MANIFEST -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/MANIFEST Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/META.json -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/META.json Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/META.yml -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/META.yml Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Command.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Command.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Command/MM.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Command/MM.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Liblist.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Liblist.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Liblist/Kid.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Liblist/Kid.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_AIX.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_AIX.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Any.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Any.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_BeOS.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_BeOS.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Cygwin.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Cygwin.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_DOS.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_DOS.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Darwin.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Darwin.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_MacOS.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_MacOS.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_NW5.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_NW5.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_OS2.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_OS2.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_OS390.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_OS390.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_QNX.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_QNX.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_UWIN.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_UWIN.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Unix.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Unix.pm Changed

@@ -13,10 +13,11 @@
 
 use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562);
 
-# If we make $VERSION an our variable parse_version() breaks
-use vars qw($VERSION);
-$VERSION = '7.62';
+# If $VERSION is in scope, parse_version() breaks
+{
+our $VERSION = '7.70';
 $VERSION =~ tr/_//d;
+}
 
 require ExtUtils::MM_Any;
 our @ISA = qw(ExtUtils::MM_Any);
@@ -34,13 +35,16 @@
     $Is{SunOS4}  = $^O eq 'sunos';
     $Is{Solaris} = $^O eq 'solaris';
     $Is{SunOS}   = $Is{SunOS4} || $Is{Solaris};
-    $Is{BSD}     = ($^O =~ /^(?:free|net|open)bsd$/ or
+    $Is{BSD}     = ($^O =~ /^(?:free|midnight|net|open)bsd$/ or
                    grep( $^O eq $_, qw(bsdos interix dragonfly) )
                   );
     $Is{Android} = $^O =~ /android/;
-    if ( $^O eq 'darwin' && $^X eq '/usr/bin/perl' ) {
+    if ( $^O eq 'darwin' ) {
       my @osvers = split /\./, $Config{osvers};
-      $Is{ApplCor} = ( $osvers0 >= 18 );
+      if ( $^X eq '/usr/bin/perl' ) {
+        $Is{ApplCor} = ( $osvers0 >= 18 );
+      }
+      $Is{AppleRPath} = ( $osvers0 >= 9 );
     }
 }
 
@@ -141,9 +145,9 @@
         $flags =~ s/"-I(\$$PERL_INC$)"/-iwithsysroot "$1"/;
     }
 
-    if (my $cpp = $Config{cpprun}) {
+    if (my $cpp = $self->{CPPRUN}) {
         my $cpp_cmd = $self->const_cccmd;
-        $cpp_cmd =~ s/^CCCMD\s*=\s*\$$CC$/$cpp/;
+        $cpp_cmd =~ s/^CCCMD\s*=\s*\$$CC$/\$(CPPRUN)/;
         push @m, qq{
 .c.i:
 	$cpp_cmd $flags \$*.c > \$*.i
@@ -1048,9 +1052,19 @@
     }
     $ldfrom = "-all $ldfrom -none" if $Is{OSF};
 
+    my $ldrun = '';
     # The IRIX linker doesn't use LD_RUN_PATH
-    my $ldrun = $Is{IRIX} && $self->{LD_RUN_PATH} ?
-                       qq{-rpath "$self->{LD_RUN_PATH}"} : '';
+    if ( $self->{LD_RUN_PATH} ) {
+        if ( $Is{IRIX} ) {
+            $ldrun = qq{-rpath "$self->{LD_RUN_PATH}"};
+        }
+        elsif ( $^O eq 'darwin' && $Is{AppleRPath} ) {
+            # both clang and gcc support -Wl,-rpath, but only clang supports
+            # -rpath so by using -Wl,-rpath we avoid having to check for the
+            # type of compiler
+            $ldrun = qq{-Wl,-rpath,"$self->{LD_RUN_PATH}"};
+        }
+    }
 
     # For example in AIX the shared objects/libraries from previous builds
     # linger quite a while in the shared dynalinker cache even when nobody
@@ -1315,7 +1329,7 @@
             if ($self->maybe_command($origcmd) && grep { $_ eq $origdir } @absdirs) {
                 my ($odev, $oino) = stat $origcmd;
                 my ($idev, $iino) = stat $interpreter;
-                if ($odev == $idev && $oino == $iino) {
+                if ($odev == $idev && $oino eq $iino) {
                     warn "$origcmd is the same as $interpreter, leaving alone"
                         if $Verbose;
                     $interpreter = $origcmd;
@@ -2183,7 +2197,7 @@
 sub init_platform {
     my($self) = shift;
 
-    $self->{MM_Unix_VERSION} = $VERSION;
+    $self->{MM_Unix_VERSION} = our $VERSION;
     $self->{PERL_MALLOC_DEF} = '-DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc '.
                                '-Dfree=Perl_mfree -Drealloc=Perl_realloc '.
                                '-Dcalloc=Perl_calloc';

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_VMS.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_VMS.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_VOS.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_VOS.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Win32.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Win32.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MM_Win95.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MM_Win95.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MY.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MY.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker.pm Changed

@@ -25,7 +25,7 @@
 our %macro_fsentity; # whether a macro is a filesystem name
 our %macro_dep; # whether a macro is a dependency
 
-our $VERSION = '7.62';
+our $VERSION = '7.70';
 $VERSION =~ tr/_//d;
 
 # Emulate something resembling CVS $Revision$
@@ -393,7 +393,7 @@
     # we will use all these variables in the Makefile
     @Get_from_Config =
         qw(
-           ar cc cccdlflags ccdlflags dlext dlsrc exe_ext full_ar ld
+           ar cc cccdlflags ccdlflags cpprun dlext dlsrc exe_ext full_ar ld
            lddlflags ldflags libc lib_ext obj_ext osname osvers ranlib
            sitelibexp sitearchexp so
           );
@@ -525,7 +525,10 @@
                     # simulate "use warnings FATAL => 'all'" for vintage perls
                     die @_;
                 };
-                version->new( $perl_version )->numify;
+                my $v = version->new($perl_version);
+                # we care about parse issues, not numify warnings
+                no warnings;
+                $v->numify;
             };
             $perl_version =~ tr/_//d
                 if defined $perl_version;
@@ -634,7 +637,7 @@
 
     if (%unsatisfied && $self->{PREREQ_FATAL}){
         my $failedprereqs = join "\n", map {"    $_ $unsatisfied{$_}"}
-                            sort { $a cmp $b } keys %unsatisfied;
+                            sort { lc $a cmp lc $b } keys %unsatisfied;
         die <<"END";
 MakeMaker FATAL: prerequisites not found.
 $failedprereqs
@@ -720,7 +723,7 @@
     # RT#91540 PREREQ_FATAL not recognized on command line
     if (%unsatisfied && $self->{PREREQ_FATAL}){
         my $failedprereqs = join "\n", map {"    $_ $unsatisfied{$_}"}
-                            sort { $a cmp $b } keys %unsatisfied;
+                            sort { lc $a cmp lc $b } keys %unsatisfied;
         die <<"END";
 MakeMaker FATAL: prerequisites not found.
 $failedprereqs
@@ -1151,19 +1154,20 @@
 }
 
 sub _run_hintfile {
-    my ($self, $hint_file) = @_;
+    our $self;
+    local($self) = shift;       # make $self available to the hint file.
+    my($hint_file) = shift;
 
     local($@, $!);
     print "Processing hints file $hint_file\n" if $Verbose;
 
-    if(open(my $fh, '<', $hint_file)) {
-        my $hints_content = do { local $/; <$fh> };
-        no strict;
-        eval $hints_content;
-        warn "Failed to run hint file $hint_file: $@" if $@;
-    }
-    else {
-        warn "Could not open $hint_file for read: $!";
+    # Just in case the ./ isn't on the hint file, which File::Spec can
+    # often strip off, we bung the curdir into @INC
+    local @INC = (File::Spec->curdir, @INC);
+    my $ret = do $hint_file;
+    if( !defined $ret ) {
+        my $error = $@ || $!;
+        warn $error;
     }
 }
 
@@ -1262,6 +1266,7 @@
     die "write_file_via_tmp: 2nd arg must be ref" unless ref $contents;
     for my $chunk (@$contents) {
         my $to_write = $chunk;
+        $to_write = '' unless defined $to_write;
         utf8::encode $to_write if !$CAN_DECODE && "$" > 5.008;
         print $fh "$to_write\n" or die "Can't write to MakeMaker.tmp: $!";
     }
@@ -1331,26 +1336,6 @@
     return "{ ".join(', ',@m)." }";
 }
 
-sub _find_magic_vstring {
-    my $value = shift;
-    return $value if $UNDER_CORE;
-    my $tvalue = '';
-    require B;
-    my $sv = B::svref_2object(\$value);
-    my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
-    while ( $magic ) {
-        if ( $magic->TYPE eq 'V' ) {
-            $tvalue = $magic->PTR;
-            $tvalue =~ s/^v?(.+)$/v$1/;
-            last;
-        }
-        else {
-            $magic = $magic->MOREMAGIC;
-        }
-    }
-    return $tvalue;
-}
-
 sub selfdocument {
     my($self) = @_;
     my(@m);
@@ -1836,7 +1821,11 @@
 =item CCFLAGS
 
 String that will be included in the compiler call command line between
-the arguments INC and OPTIMIZE.
+the arguments INC and OPTIMIZE. Note that setting this will overwrite its
+default value (C<$Config::Config{ccflags}>); to preserve that, include
+the default value directly, e.g.:
+
+    CCFLAGS => "$Config::Config{ccflags} ..."
 
 =item CONFIG
 
@@ -1846,6 +1835,7 @@
 cc
 cccdlflags
 ccdlflags
+cpprun
 dlext
 dlsrc
 ld
@@ -2671,10 +2661,9 @@
 
 =item POLLUTE
 
-Release 5.005 grandfathered old global symbol names by providing preprocessor
-macros for extension source compatibility.  As of release 5.6, these
-preprocessor definitions are not available by default.  The POLLUTE flag
-specifies that the old names should still be defined:
+Prior to 5.6 various interpreter variables were available without a C<PL_>
+prefix, eg. C<PL_undef> was available as C<undef>. As of release 5.6, these
+are only defined if the POLLUTE flag is enabled:
 
   perl Makefile.PL POLLUTE=1
 
@@ -3293,7 +3282,7 @@
 is installed).  Clients like L<CPAN> or L<CPANPLUS> will read these
 files to see what prerequisites must be fulfilled before building or testing
 the distribution.  If you wish to shut this feature off, set the C<NO_MYMETA>
-C<WriteMakeFile()> flag to true.
+C<WriteMakefile()> flag to true.
 
 =head2 Disabling an extension

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/Config.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/Config.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/FAQ.pod -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/FAQ.pod Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/Locale.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/Locale.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/Tutorial.pod -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/Tutorial.pod Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/version.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/version.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/version/regex.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/version/regex.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/MakeMaker/version/vpp.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/MakeMaker/version/vpp.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Mkbootstrap.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Mkbootstrap.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/Mksymlists.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/Mksymlists.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/lib/ExtUtils/testlib.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/lib/ExtUtils/testlib.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/04-xs-rpath-darwin.t Added

@@ -0,0 +1,269 @@
+#!/usr/bin/perl -w
+
+# This test file tests a special case for the generation of XS modules on OS darwin.
+#  More specifically, it tests if we are able to compile an XS module which refers
+#  to another shared library in a non-standard location such that we can
+#  load the XS module from a perl script without having to set the
+#  DYLD_LIBRARY_PATH environment variable. See PR #403 and issue #402.
+#
+package Main;
+use strict;
+use warnings;
+use Config;
+BEGIN {
+    chdir 't' or die "chdir(t): $!\n";
+    unshift @INC, 'lib/';
+    use Test::More;
+    if( $^O ne "darwin" ) {
+        plan skip_all => 'Not darwin platform';
+    }
+    else {
+        plan skip_all => 'Dynaloading not enabled'
+            if !$Config{usedl} or $Config{usedl} ne 'define';
+        plan tests => 1;
+    }
+}
+use Cwd;
+use ExtUtils::MakeMaker;
+use File::Temp qwtempdir;
+use File::Path;  # exports: mkpath and rmtree
+use File::Spec;
+
+{
+    $| = 1;
+    # We need this when re-running "perl Makefile.PL"
+    my $ext_utils_lib_dir = File::Spec->rel2abs('../lib');
+    # This tmpdir will be removed when the program exits
+    my $tmpdir = tempdir( DIR => '.', CLEANUP => 1 );
+    my $cwd = getcwd;
+    # File::Temp will not clean up the temp directory if the current directory
+    #   is a sub directory of the temp dir. This can happen in the case of an
+    #   error (a call to die). which disrupts the normal program flow that would
+    #   have restored the cwd before exit. To solve this issue
+    #   we add the below END block (which will be called before the File::Temp
+    #   cleanup END block call since END blocks are called in LIFO order)
+    END { chdir $cwd }
+    _chdir($tmpdir);
+    my $self = Main->new(
+        mylib_dir => "mylib",
+        mylib_c_fn => "mylib.c",
+        mylib_h_fn => "mylib.h",
+        mylib_lib_name => "mylib",
+        module_name => "My::Module",
+        test_script_name => 'p.pl',
+        ext_utils_lib_dir => $ext_utils_lib_dir,
+    );
+    $self->compile_library();
+    $self->write_makefile_pl();
+    $self->write_module_file();
+    $self->write_xs_file();
+    $self->run_make();
+    $self->write_test_script();
+    $self->run_test_script();
+    _chdir($cwd);
+}
+
+sub _chdir { chdir $_0 or die "Cannot change directory to $_0 : $!" }
+
+sub _mkpath { mkpath($_0) or die "Could not create directory $_0 : $!" };
+
+sub run_test_script {
+    my ($self) = @_;
+
+    my @cmd = ($^X, '-Mblib', $self->{test_script_name});
+    my $out = _capture_stdout(\@cmd);
+    like( $out, qr{\Qcalling foo()\E\s+\QHello from foo()\E});
+}
+
+sub write_xs_file {
+    my ($self) = @_;
+
+    my $str = <<'END';
+#include "EXTERN.h"
+#include "perl.h"
+#include "XSUB.h"
+#include "mylib.h"
+
+MODULE = <<module_name_colon>>  PACKAGE = <<module_name_colon>>
+PROTOTYPES: DISABLE
+
+void
+mylib_func()
+  CODE:
+    printf("calling foo()\n");
+    foo();
+END
+    $str =~ s/\Q<<module_name_colon>>\E/$self->{module_name}/g;
+    my @module_name = split /::/, $self->{module_name};
+    my $xs_name = pop @module_name;
+    $xs_name .= '.xs';
+    _write_file( $xs_name, $str );
+}
+
+sub write_test_script {
+    my ($self) = @_;
+
+    my $str = <<'END';
+use strict;
+use warnings;
+use ExtUtils::testlib;
+use <<module_name_colon>>;
+
+<<module_name_colon>>::mylib_func();
+END
+    $str =~ s/\Q<<module_name_colon>>\E/$self->{module_name}/g;
+    _write_file( $self->{test_script_name}, $str );
+}
+
+sub run_make {
+    my ($self) = @_;
+
+    my @cmd = ($^X, '-I'. $self->{ext_utils_lib_dir}, 'Makefile.PL');
+    _run_system_cmd(\@cmd);
+    _run_system_cmd('make');
+}
+
+sub write_module_file {
+    my ( $self ) = @_;
+
+    my @dirs = split /::/, $self->{module_name};
+    my $basename = pop @dirs;
+    my $dir = File::Spec->catfile('lib', @dirs);
+    _mkpath( $dir );
+    my $fn = File::Spec->catfile($dir, $basename . '.pm');
+    my $str = <<'END';
+package <<module_name_colon>>;
+require Exporter;
+require DynaLoader;
+$VERSION = 1.01;
+@ISA    = qw(Exporter DynaLoader);
+@EXPORT = qw();
+bootstrap <<module_name_colon>> $VERSION;
+1;
+
+=head1 NAME
+
+<<module_name_colon>> - Short description of <<module_name_colon>>
+END
+    $str =~ s/\Q<<module_name_colon>>\E/$self->{module_name}/g;
+    _write_file( $fn, $str );
+}
+
+sub write_makefile_pl {
+    my ( $self ) = @_;
+
+    my $str = <<'END';
+use strict;
+use warnings;
+use ExtUtils::MakeMaker;
+
+WriteMakefile(
+  NAME          => '<<module_name_colon>>',
+  VERSION_FROM  => 'lib/<<module_name_slash>>.pm',
+  ABSTRACT_FROM => 'lib/<<module_name_slash>>.pm',
+  PERL          => "$^X -w",
+  LIBS          => '-L./<<lib_dir>> -l<<lib_name>>',
+  INC           => '-I. -I./<<lib_dir>>',
+);
+END
+    my $mod_name1 = $self->{module_name};
+    my $mod_name2 = $self->{module_name};
+    $mod_name2 =~ s{::}{/}g;
+    $str =~ s/\Q<<module_name_colon>>\E/$mod_name1/g;
+    $str =~ s/\Q<<module_name_slash>>\E/$mod_name2/g;
+    $str =~ s/\Q<<lib_dir>>\E/$self->{mylib_dir}/g;
+    $str =~ s/\Q<<lib_name>>\E/$self->{mylib_lib_name}/g;
+    _write_file('Makefile.PL', $str);
+}
+
+sub compile_library {
+    my ($self) = @_;
+
+    _mkpath( $self->{mylib_dir} );
+    my $cwd = getcwd;
+    _chdir( $self->{mylib_dir} );
+    $self->write_mylib_h();
+    $self->write_mylib_c();
+    $self->compile_mylib();
+    _chdir( $cwd );
+}
+
+sub compile_mylib {
+    my ($self) = @_;
+
+    my $cc = $Config{cc};
+    my $libext = $Config{so};
+
+    my $libname = 'lib' . $self->{mylib_lib_name} . '.' . $libext;
+    my @cmd = ($cc, '-I.', '-dynamiclib', '-install_name',
+             '@rpath/' . $libname,

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/INST.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/INST.t Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/INST_PREFIX.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/INST_PREFIX.t Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/eu_command.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/eu_command.t Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/hints.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/hints.t Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/lib/MakeMaker/Test/Setup/BFD.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/lib/MakeMaker/Test/Setup/BFD.pm Changed

@@ -103,11 +103,20 @@
 
             );
 
+my $tmpdir;
 
 # if given args, those are inserted as components in resulting path, eg:
 # setup_recurs('dir') means instead of creating Big-Dummy/*, dir/Big-Dummy/*
 sub setup_recurs {
-    while(my($file, $text) = each %Files) {
+    my @chrs = ( "A" .. "Z", 0 .. 9 );
+    # annoyingly we cant use File::Temp here as it drags in XS code
+    # and we run under blocks to prevent XS code loads. This is a minimal
+    # patch to fix the issue.
+    $tmpdir = join "", "./temp-$$-", map { $chrsrand(@chrs) } 1..8;
+    mkdir($tmpdir) or die "Failed to create '$tmpdir': $!";
+    chdir($tmpdir) or die "Failed to chdir '$tmpdir': $!";
+    foreach my $file (sort keys %Files) {
+        my $text = $Files{$file};
         # Convert to a relative, native file path.
         $file = File::Spec->catfile(File::Spec->curdir, @_, split m{\/}, $file);
         $file = File::Spec->rel2abs($file);
@@ -131,9 +140,11 @@
     foreach my $file (keys %Files) {
         my $dir = dirname($file);
         if( -e $dir ) {
-            rmtree($dir) || return;
+            rmtree($dir) or next;
         }
     }
+    chdir("..");
+    rmtree($tmpdir);
     return 1;
 }

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/lib/Test/More.pm -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/lib/Test/More.pm Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/min_perl_version.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/min_perl_version.t Changed

_service:tar_scm:ExtUtils-MakeMaker-7.62.tar.gz/t/prereq.t -> _service:tar_scm:ExtUtils-MakeMaker-7.70.tar.gz/t/prereq.t Changed

Changes of Revision 3