Find perl even if it lacks $Config{_exe} suffix

Also, cleanup in Makefile.PL, and reporting version in dotted-decimal
format even though it's not stored that way.

All test/testhere/testpacked tests pass on my 5.26.1 and 5.10.1.

Author: Chris White

Makefile.PL

@@ -4,25 +4,36 @@ use warnings;
 use ExtUtils::MakeMaker;
 use Config;
 
-# Get the filename of the Perl interpreter running this.  From perlvar.
-my $secure_perl_path = $Config{perlpath};
-if ($^O ne 'VMS') {
-    $secure_perl_path .= $Config{_exe}
-        unless $secure_perl_path =~ m/$Config{_exe}$/i;
-}
+# Get the filename of the Perl interpreter running this.  Modified from perlvar.
+# The -x test is for cygwin or other systems where $Config{perlpath} has no
+# extension and $Config{_exe} is nonempty.  E.g., symlink perl->perl5.10.1.exe.
+# There is no "perl.exe" on such a system.
+sub get_perl_filename {
+    my $secure_perl_path = $Config{perlpath};
+    if ($^O ne 'VMS') {
+        $secure_perl_path .= $Config{_exe}
+            unless (-x $secure_perl_path) ||
+                            ($secure_perl_path =~ m/$Config{_exe}$/i);
+    }
+    return $secure_perl_path;
+} # get_perl_filename()
+
+my $secure_perl_path = get_perl_filename();
 
 sub MY::postamble {     # TODO also handle Windows nmake syntax (SET vs. export)
     return <<EOT;
 authortest:
 \tRELEASE_TESTING=1 prove -l xt"
 
 testhere:   # Run the tests from lib rather than blib
-\tperl -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
+\t"$secure_perl_path" -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 
-testpacked: pack    # Test the packed version
+testpacked: pack    # Test the packed version.
 \tPERLPP_NOUSE=1 PERLPP_PERLOPTS="blib/perlpp" \\
-\tperl -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
+\t"$secure_perl_path" -Ilib -e 'use Test::Harness "runtests"; runtests \@ARGV;' -- t/*.t
 EOT
+    # Note: testpacked uses -Ilib so that I don't have to conditionally
+    # use Text::PerlPP in t/lib/PerlPPTest.pm.
 } #postamble
 
 WriteMakefile(
@@ -39,15 +50,15 @@ WriteMakefile(
     },
     BUILD_REQUIRES => {
         'App::FatPacker' => '0',
-        'IPC::Run3' => '0',
-        'Test::More' => '0',
     },
     TEST_REQUIRES => {
         'Capture::Tiny' => '0',
         'Carp' => '0',
         'Config' => '0',
         'File::Spec' => '0',
+        'IPC::Run3' => '0',
         'rlib' => '0',
+        'Test::More' => '0',
         'Text::ParseWords' => '0',
         'Text::Diff' => '0',   # for t/03-idempotency.t
     },

lib/Text/PerlPP.pm

@@ -3,6 +3,8 @@
 
 package Text::PerlPP;
 
+# Semantic versioning, packed per Perl rules.  Must always be at least one
+# digit left of the decimal, and six digits right of the decimal.
 our $VERSION = '0.500001';
 
 use 5.010001;
@@ -805,8 +807,9 @@ sub Main {
 		return EXIT_OK;		# TODO report param err vs. proc err?
 	}
 
-	if($self->{Opts}->{PRINT_VERSION}) {
-		print "PerlPP version $Text::PerlPP::VERSION\n";
+	if($self->{Opts}->{PRINT_VERSION}) {	# print version, raw and dotted
+		$Text::PerlPP::VERSION =~ m<^([^\.]+)\.(\d{3})(\d{3})>;
+		printf "PerlPP version %d.%d.%d ($VERSION)\n", $1, $2, $3;
 		if($self->{Opts}->{PRINT_VERSION} > 1) {
 			print "Script: $0\nText::PerlPP: $INC{'Text/PerlPP.pm'}\n";
 		}

t/lib/PerlPPTest.pm

@@ -52,20 +52,29 @@ sub run_perlpp {
 	#do { (my $args = Dumper($lrArgs)) =~ s/^/##/gm;
 	#say STDERR "## args:\n$args"; };
 
-	if($ENV{PERLPP_PERLOPTS}) {
-		#my $cmd = join(' ', get_perl_filename(), $ENV{PERLPP_PERLOPTS},
-		#		@$lrArgs);
-		my $cmd = [get_perl_filename(), shellwords($ENV{PERLPP_PERLOPTS}),
-					@$lrArgs];
+	if($ENV{PERLPP_PERLOPTS}) {			# Run external perl
+		state $printed_perl;
+
+		my $perl = get_perl_filename();
+		BAIL_OUT("Cannot find executable perl (tried $perl)") unless -x $perl;
+
+		unless($printed_perl) {		# Report it once for the sake of the logs
+			say STDERR "# External perl: {$perl}";
+			$printed_perl = 1;
+		}
+
+		my $cmd = [$perl, shellwords($ENV{PERLPP_PERLOPTS}), @$lrArgs];
+
 		#say STDERR '# running external perl: {', join('|',@$cmd), '}';
 		$retval = run3($cmd, $refStdin, $refStdout, $refStderr);
 		#say STDERR "#  returned $retval; status $?";
+
 		# TODO figure out $?, retval, &c.
 		# TODO tell the caller if the user hit Ctl-C on the inner perl
 		# invocation so the caller can abort if desired.
 		# That seems to be status 2, on my test system.
 
-	} else {
+	} else {							# Run perl code under this perl
 		#say STDERR "# running perlpp internal";
 		#say STDERR "# redirecting stdin";
 		open local(*STDIN), '<', $refStdin or die $!;
@@ -90,12 +99,16 @@ sub run_perlpp {
 	return $retval;
 } #run_perlpp
 
-# Get the filename of the Perl interpreter running this.  From perlvar.
+# Get the filename of the Perl interpreter running this.  Modified from perlvar.
+# The -x test is for cygwin or other systems where $Config{perlpath} has no
+# extension and $Config{_exe} is nonempty.  E.g., symlink perl->perl5.10.1.exe.
+# There is no "perl.exe" on such a system.
 sub get_perl_filename {
 	my $secure_perl_path = $Config{perlpath};
 	if ($^O ne 'VMS') {
 		$secure_perl_path .= $Config{_exe}
-			unless $secure_perl_path =~ m/$Config{_exe}$/i;
+			unless (-x $secure_perl_path) ||
+							($secure_perl_path =~ m/$Config{_exe}$/i);
 	}
 	return $secure_perl_path;
 } # get_perl_filename()