Install instmodsh and xsubpp in bin/ along the other utilities.

p4raw-id: //depot/perl@21740

diff --git a/MANIFEST b/MANIFEST
index 4290128..c2d69b2 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -2909,6 +2909,7 @@ utils/dprofpp.PL          Perl code profile post-processor
 utils/enc2xs.PL                        Encode module generator
 utils/h2ph.PL                  A thing to turn C .h files into perl .ph files
 utils/h2xs.PL                  Program to make .xs files from C header files
+utils/instmodsh.PL             Give information about installed extensions
 utils/libnetcfg.PL             libnet
 utils.lst                      Lists utilities bundled with Perl
 utils/Makefile                 Extract the utility scripts
@@ -2919,6 +2920,7 @@ utils/perlivp.PL          installation verification procedure
 utils/piconv.PL                        iconv(1), reinvented in perl
 utils/pl2pm.PL                 A pl to pm translator
 utils/splain.PL                        Stand-alone version of diagnostics.pm
+utils/xsubpp.PL                        External subroutine preprocessor
 uts/sprintf_wrap.c             sprintf wrapper for UTS
 uts/strtol_wrap.c              strtol wrapper for UTS
 vmesa/Makefile                 VM/ESA Makefile

diff --git a/installperl b/installperl
index a12ec62..bd10643 100755 (executable)
--- a/installperl
+++ b/installperl
@@ -801,8 +801,9 @@ sub installlib {
     # .exists files, .PL files, and test files.
     return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$} ||
              $dir  =~ m{/t(?:/|$)};
-    # ignore the cpan script in lib/CPAN/bin (installed later with other utils)
-    return if $name eq 'cpan';
+    # ignore the cpan script in lib/CPAN/bin and the instmodsh and xsubpp
+    # scripts in lib/ExtUtils (they're installed later with other utils)
+    return if $name =~ /^(?:cpan|instmodsh|xsubpp)\z/;
     # ignore the Makefiles
     return if $name =~ /^makefile$/i;
     # ignore the test extensions

diff --git a/utils.lst b/utils.lst
index 175a514..555ff9d 100644 (file)
--- a/utils.lst
+++ b/utils.lst
@@ -1,4 +1,3 @@
-lib/ExtUtils/xsubpp
 pod/pod2html
 pod/pod2latex
 pod/pod2man
@@ -12,6 +11,7 @@ utils/dprofpp
 utils/enc2xs
 utils/h2ph
 utils/h2xs
+utils/instmodsh
 utils/libnetcfg
 utils/perlbug
 utils/perlcc
@@ -20,6 +20,7 @@ utils/perlivp
 utils/piconv
 utils/pl2pm
 utils/splain
+utils/xsubpp
 x2p/a2p         # pod = x2p/a2p.pod
 x2p/find2perl
 x2p/s2p         # link = x2p/psed

diff --git a/utils/Makefile b/utils/Makefile
index 8b98950..8523799 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -5,9 +5,9 @@ REALPERL = ../perl
 # Files to be built with variable substitution after miniperl is
 # available.  Dependencies handled manually below (for now).
 
-pl = c2ph.PL cpan.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL splain.PL perlcc.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL
-plextract = c2ph cpan h2ph h2xs perlbug perldoc perlivp pl2pm splain perlcc dprofpp libnetcfg piconv enc2xs
-plextractexe = ./c2ph ./cpan ./h2ph ./h2xs ./perlbug ./perldoc ./perlivp ./pl2pm ./splain ./perlcc ./dprofpp ./libnetcfg ./piconv ./enc2xs
+pl = c2ph.PL cpan.PL h2ph.PL h2xs.PL instmodsh.PL perlbug.PL perldoc.PL perlivp.PL pl2pm.PL splain.PL perlcc.PL dprofpp.PL libnetcfg.PL piconv.PL enc2xs.PL xsubpp.PL
+plextract = c2ph cpan h2ph h2xs instmodsh perlbug perldoc perlivp pl2pm splain perlcc dprofpp libnetcfg piconv enc2xs xsubpp
+plextractexe = ./c2ph ./cpan ./h2ph ./h2xs ./instmodsh ./perlbug ./perldoc ./perlivp ./pl2pm ./splain ./perlcc ./dprofpp ./libnetcfg ./piconv ./enc2xs ./xsubpp
 
 all: $(plextract) 
 
@@ -35,6 +35,8 @@ h2ph:         h2ph.PL ../config.sh
 
 h2xs:          h2xs.PL ../config.sh
 
+instmodsh:     instmodsh.PL ../config.sh
+
 perlbug:       perlbug.PL ../config.sh ../patchlevel.h
 
 perldoc:       perldoc.PL ../config.sh
@@ -55,6 +57,8 @@ piconv:               piconv.PL ../config.sh
 
 enc2xs:                enc2xs.PL ../config.sh
 
+xsubpp:                xsubpp.PL ../config.sh
+
 clean:
 
 realclean:

diff --git a/utils/instmodsh.PL b/utils/instmodsh.PL
new file mode 100644 (file)
index 0000000..3bc0359
--- /dev/null
+++ b/utils/instmodsh.PL
@@ -0,0 +1,48 @@
+#!/usr/local/bin/perl
+
+use Config;
+use File::Basename qw(&basename &dirname);
+use Cwd;
+
+# List explicitly here the variables you want Configure to
+# generate.  Metaconfig only looks for shell variables, so you
+# have to mention them as if they were shell variables, not
+# %Config entries.  Thus you write
+#  $startperl
+# to ensure Configure will look for $Config{startperl}.
+
+# This forces PL files to create target in same directory as PL file.
+# This is so that make depend always knows where to find PL derivatives.
+my $origdir = cwd;
+chdir dirname($0);
+my $file = basename($0, '.PL');
+$file .= '.com' if $^O eq 'VMS';
+
+open OUT,">$file" or die "Can't create $file: $!";
+
+print "Extracting $file (with variable substitutions)\n";
+
+# In this section, perl variables will be expanded during extraction.
+# You can use $Config{...} to use Configure variables.
+
+print OUT <<"!GROK!THIS!";
+$Config{startperl}
+    eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+       if \$running_under_some_shell;
+!GROK!THIS!
+
+use File::Spec;
+
+my $instmodsh = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "lib", "ExtUtils"), "instmodsh");
+
+if (open(INSTMODSH, $instmodsh)) {
+    print OUT <INSTMODSH>;
+    close INSTMODSH;
+} else {
+    die "$0: cannot find '$instmodsh'\n";
+}
+
+close OUT or die "Can't close $file: $!";
+chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
+exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
+chdir $origdir;

diff --git a/utils/xsubpp.PL b/utils/xsubpp.PL
new file mode 100644 (file)
index 0000000..86c4393
--- /dev/null
+++ b/utils/xsubpp.PL
@@ -0,0 +1,48 @@
+#!/usr/local/bin/perl
+
+use Config;
+use File::Basename qw(&basename &dirname);
+use Cwd;
+
+# List explicitly here the variables you want Configure to
+# generate.  Metaconfig only looks for shell variables, so you
+# have to mention them as if they were shell variables, not
+# %Config entries.  Thus you write
+#  $startperl
+# to ensure Configure will look for $Config{startperl}.
+
+# This forces PL files to create target in same directory as PL file.
+# This is so that make depend always knows where to find PL derivatives.
+my $origdir = cwd;
+chdir dirname($0);
+my $file = basename($0, '.PL');
+$file .= '.com' if $^O eq 'VMS';
+
+open OUT,">$file" or die "Can't create $file: $!";
+
+print "Extracting $file (with variable substitutions)\n";
+
+# In this section, perl variables will be expanded during extraction.
+# You can use $Config{...} to use Configure variables.
+
+print OUT <<"!GROK!THIS!";
+$Config{startperl}
+    eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+       if \$running_under_some_shell;
+!GROK!THIS!
+
+use File::Spec;
+
+my $xsubpp = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "lib", "ExtUtils"), "xsubpp");
+
+if (open(XSUBPP, $xsubpp)) {
+    print OUT <XSUBPP>;
+    close XSUBPP;
+} else {
+    die "$0: cannot find '$xsubpp'\n";
+}
+
+close OUT or die "Can't close $file: $!";
+chmod 0755, $file or die "Can't reset permissions for $file: $!\n";
+exec("$Config{'eunicefix'} $file") if $Config{'eunicefix'} ne ':';
+chdir $origdir;