miniperl-ification of ext/utils/make_ext

diff --git a/ext/util/make_ext.pl b/ext/util/make_ext.pl
index 6152aa8..f6b7b51 100644 (file)
--- a/ext/util/make_ext.pl
+++ b/ext/util/make_ext.pl
@@ -1,19 +1,21 @@
-#!/bin/sh
+#!/bin/perl
+use strict;
+use warnings;
 
 # This script acts as a simple interface for building extensions.
 # It primarily used by the perl Makefile:
 #
 # d_dummy $(dynamic_ext): miniperl preplibrary FORCE
-#      @sh ext/util/make_ext dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
+#      @$(RUN) ./miniperl ext/util/make_ext.pl dynamic $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
 #
 # It may be deleted in a later release of perl so try to
 # avoid using it for other purposes.
 
-target=$1;  shift
-extspec=$1; shift
-makecmd=$1; shift  # Should be something like MAKE=make
-passthru="$*" # allow extra macro=value to be passed through
-echo ""
+my $target   = shift(@ARGV);
+my $extspec  = shift(@ARGV);
+my $makecmd  = shift(@ARGV); # Should be something like MAKE=make
+my $passthru = join(' ', @ARGV); # allow extra macro=value to be passed through
+print "\n";
 
 # Previously, $make was taken from config.sh.  However, the user might
 # instead be running a possibly incompatible make.  This might happen if
@@ -22,35 +24,40 @@ echo ""
 # makefile as MAKE=/whatever/make in $makecmd.  We'll be cautious in
 # case third party users of this script (are there any?) don't have the
 # MAKE=$(MAKE) argument, which was added after 5.004_03.
-case "$makecmd" in
-MAKE=*)
-       eval $makecmd
-       ;;
-*)     echo 'ext/util/make_ext:  WARNING:  Please include MAKE=$(MAKE)'
-       echo '  in your call to make_ext.  See ext/util/make_ext for details.'
-       exit 1
-       ;;
-esac
-
-
-case $CONFIG in
-'')
-    if test -f config.sh; then TOP=.;
-    elif test -f ../config.sh; then TOP=..;
-    elif test -f ../../config.sh; then TOP=../..;
-    elif test -f ../../../config.sh; then TOP=../../..;
-    elif test -f ../../../../config.sh; then TOP=../../../..;
-    else
-        echo "Can't find config.sh generated by Configure"; exit 1
-    fi
-    . $TOP/config.sh
-    ;;
-esac
-
-if test "X$extspec" = X; then
-       echo "make_ext: no extension specified"
-       exit 1;
-fi
+my $make;
+if (defined($makecmd) and $makecmd =~ /^MAKE=(.*)$/) {
+       $make = $1;
+}
+else {
+       print "ext/util/make_ext:  WARNING:  Please include MAKE=\$(MAKE)\n";
+       print "\tin your call to make_ext.  See ext/util/make_ext for details.\n";
+       exit(1);
+}
+
+# search config.sh for inclusion
+$ENV{CONFIG} = '' if not defined $ENV{CONFIG};
+if ($ENV{CONFIG} eq '') {
+       my $config;
+       foreach my $depth (0..4) {
+               my $file = ('../' x $depth) . 'config.sh';
+               $config = $file, last if -f $file;
+       }
+       print("Can't find config.sh generated by Configure"), exit(1)
+         unless defined $config;
+  
+       load_config_sh($config);
+}
+
+# fallback to config.sh's MAKE
+$make ||= $ENV{make} || $ENV{MAKE};
+my $run = $ENV{run};
+$run = '' if not defined $run;
+$run .= ' ' if $run ne '';;
+
+if (!defined($extspec) or $extspec eq '')  {
+       print "make_ext: no extension specified\n";
+       exit(1);
+}
 
 # The Perl Makefile.SH will expand all extensions to
 #      lib/auto/X/X.a  (or lib/auto/X/Y/Y.a if nested)
@@ -58,89 +65,123 @@ fi
 #      X (or X/Y or X::Y if nested)
 
 # canonise into X/Y form (pname)
-case "$extspec" in
-lib*)  # Remove lib/auto prefix and /*.* suffix
-       pname=`echo "$extspec" | sed -e 's:^lib/auto/::' -e 's:/[^/]*\.[^/]*$::' ` ;;
-ext*)  # Remove ext/ prefix and /pm_to_blib suffix
-       pname=`echo "$extspec" | sed -e 's:^ext/::' -e 's:/pm_to_blib$::' ` ;;
-*::*)  # Convert :: to /
-       pname=`echo "$extspec" | sed -e 's/::/\//g' ` ;;
-*.*o)    pname=`echo "$extspec" | sed -e 's/\..*o//'` ;;
-*)     pname="$extspec" ;;
-esac
-# echo "Converted $extspec to $pname"
-
-mname=`echo "$pname"   | sed -e 's!/!::!g'`
-depth=`echo "$pname"   | sed -e 's![^/][^/]*!..!g'`
-makefile=Makefile
-makeargs=''
-makeopts=''
-
-if test ! -d "ext/$pname"; then
-    echo "     Skipping $extspec (directory does not exist)"
-    exit 0 # not an error ?
-fi
-
-case "$osname" in
-catamount) # Snowball's chance of building extensions.
-  echo "This is $osname, not building $mname, sorry."
-  exit 0
-  ;;
-esac
-
-echo " Making $mname ($target)"
-
-cd ext/$pname
+
+my $pname = $extspec;
+if ($extspec =~ /^lib/) {
+       # Remove lib/auto prefix and /*.* suffix
+       $pname =~ s{^lib/auto/}{};
+       $pname =~ s{[^/]*\.[^/]*$}{};
+}
+elsif ($extspec =~ /^ext/) {
+       # Remove ext/ prefix and /pm_to_blib suffix
+       $pname =~ s{^ext/}{};
+       $pname =~ s{/pm_to_blib$}{};
+}
+elsif ($extspec =~ /::/) {
+       # Convert :: to /
+       $pname =~ s{::}{\/}g;
+}
+elsif ($extspec =~ /\..*o$/) {
+       $pname =~ s/\..*o//;
+}
+
+my $mname = $pname;
+$mname =~ s!/!::!g;
+my $depth = $pname;
+$depth =~ s![^/]+!..!g;
+my $makefile = "Makefile";
+my $makeargs = '';
+my $makeopts = '';
+
+if (not -d "ext/$pname") {
+       print "\tSkipping $extspec (directory does not exist)\n";
+       exit(0); # not an error ?
+}
+
+if ($ENV{osname} eq 'catamount') {
+       # Snowball's chance of building extensions.
+       print "This is $ENV{osname}, not building $mname, sorry.\n";
+       exit(0);
+}
+
+print "\tMaking $mname ($target)\n";
+
+chdir("ext/$pname");
 
 # check link type and do any preliminaries.  Valid link types are
 # 'dynamic', 'static', and 'static_pic' (the last one respects
 # CCCDLFLAGS such as -fPIC -- see static_target in the main Makefile.SH)
-case "$target" in
-dynamic)    makeargs="LINKTYPE=dynamic";
-           target=all
-           ;;
-static)     makeargs="LINKTYPE=static CCCDLFLAGS="
-           target=all
-           ;;
-static_pic) makeargs="LINKTYPE=static"
-           target=all
-           ;;
-nonxs)      makeargs="";
-           target=all
-           ;;
-
-*clean) # If Makefile has been moved to Makefile.old by a make clean
-           # then use Makefile.old for realclean rather than rebuild it
-           if test ! -f $makefile -a -f Makefile.old; then
-               makefile=Makefile.old
-               makeopts="-f $makefile"
-               echo "Note: Using Makefile.old"
-           fi
-           ;;
-
-*)     # for the time being we are strict about what make_ext is used for
-       echo "make_ext: unknown make target '$target'"; exit 1
-       ;;
-'')    echo "make_ext: no make target specified (eg static or dynamic)"; exit 1
-       ;;
-esac
-
-if test ! -f $makefile ; then
-       test -f Makefile.PL && $run ../$depth/miniperl -I../$depth/lib Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru
-fi
-if test ! -f $makefile ; then
-       echo "Warning: No Makefile!"
-fi
-
-case "$target" in
-clean)         ;;
-realclean)     ;;
-*)     # Give makefile an opportunity to rewrite itself.
+if ($target eq 'dynamic') {
+       $makeargs = "LINKTYPE=dynamic";
+       $target   = 'all';
+}
+elsif ($target eq 'static') {
+       $makeargs = "LINKTYPE=static CCCDLFLAGS=";
+       $target   = 'all';
+}
+elsif ($target eq 'static_pic') {
+       $makeargs = "LINKTYPE=static";
+       $target   = 'all';
+}
+elsif ($target eq 'nonxs') {
+       $makeargs = "";
+       $target   = 'all';
+}
+elsif ($target =~ /clean$/) {
+       # If Makefile has been moved to Makefile.old by a make clean
+       # then use Makefile.old for realclean rather than rebuild it
+       if (! -f $makefile and -f "Makefile.old") {
+               $makefile = "Makefile.old";
+               $makeopts = "-f $makefile";
+               print "Note: Using Makefile.old\n";
+       }
+}
+elsif ($target eq '') {
+       print "make_ext: no make target specified (eg static or dynamic)\n";
+       exit(1);
+}
+else {
+       # for the time being we are strict about what make_ext is used for
+       print "make_ext: unknown make target '$target'\n";
+       exit(1);
+}
+
+
+if (not -f $makefile) {
+       if (-f "Makefile.PL") {
+               system("${run}../$depth/miniperl -I../$depth/lib Makefile.PL INSTALLDIRS=perl INSTALLMAN3DIR=none PERL_CORE=1 $passthru");
+       }
+}
+
+if (not -f $makefile) {
+       print "Warning: No Makefile!\n";
+}
+
+if ($target eq 'clean') {
+}
+elsif ($target eq 'realclean') {
+}
+else {
+       # Give makefile an opportunity to rewrite itself.
        # reassure users that life goes on...
-       $MAKE config MAKE=$MAKE $passthru || echo "$MAKE config failed, continuing anyway..."
-       ;;
-esac
-
-$MAKE $makeopts $target MAKE=$MAKE $makeargs $passthru || exit
-
-exit $?
+       system( "$run$make config MAKE=$make $passthru" )
+         and print "$make config failed, continuing anyway...\n";
+}
+
+system(
+       "$run$make $target MAKE=$make $makeargs $passthru"
+) or exit();
+
+exit($?);
+
+# read config.sh and add its keys to our %ENV
+sub load_config_sh {
+       my $file = shift;
+       open my $fh, '<', $file or die "Could not open file '$file' as a 'config.sh': $!";
+       while (<$fh>) {
+               chomp;
+               next if /^\s*#/;
+               $ENV{$1} = $3 if /^(?!:)([^\s=]+)=('?)(.*?)\2$/;
+       }
+       close $fh;
+}