summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f1f4497)
This shares all the existing deficiencies of utils/Makefile.SH, and
generates a byte-for-byte identical utils/Makefile, including boilerplate
that claims it was generated by utils/Makefile.SH
utils/Makefile remains as a file checked into the repository, and is not (yet)
deleted, because as-was only *nix platforms could run utils/Makefile.SH to
generate utils/Makefile. This messy state of affairs means that if you build
with static linking, the checked-out utils/Makefile is modified
('../miniperl' is replaced with '../perl')
The next commit will resolve just these bugs.
In turn, it seems that the pre-generated utils/Makefile is only used by
Win32, as VMS contains rules in descrip_mms.template to build the
utilities. Probably the next thing to unpick is the build on VMS, but it
seems better to reduce the size of the "problem" in both utils/Makefile.PL
and vms/descrip_mms.template by attempting to move the work from them to
the extension directories and ExtUtils::MakeMaker.
utils/libnetcfg.PL libnet
utils.lst Lists utilities bundled with Perl
utils/Makefile Pregenerated from utils/Makefile.SH
utils/libnetcfg.PL libnet
utils.lst Lists utilities bundled with Perl
utils/Makefile Pregenerated from utils/Makefile.SH
-utils/Makefile.SH Extract the utility scripts
+utils/Makefile.PL Extract the utility scripts
utils/perlbug.PL A simple tool to submit a bug report
utils/perldoc.PL A simple tool to find & display perl's documentation
utils/perlivp.PL installation verification procedure
utils/perlbug.PL A simple tool to submit a bug report
utils/perldoc.PL A simple tool to find & display perl's documentation
utils/perlivp.PL installation verification procedure
x2p/find2perl: $x2p_deps
cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
x2p/find2perl: $x2p_deps
cd x2p; \$(LDLIBPTH) \$(MAKE) find2perl
+utils/Makefile: \$(MINIPERL_EXE) \$(CONFIGPM) utils/Makefile.PL
+ \$(MINIPERL) -Ilib utils/Makefile.PL
+
+utilities: utils/Makefile $util_deps
@echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
!GROK!THIS!
@echo " "; echo " Making utilities"; cd utils; \$(LDLIBPTH) \$(MAKE) all
!GROK!THIS!
- ### add an entry to utils/Makefile.SH for $bin
- { my $file = "utils/Makefile.SH";
+ ### add an entry to utils/Makefile.PL for $bin
+ { my $file = "utils/Makefile.PL";
### not there already?
unless( `grep $bin $Repo/$file` ) {
### not there already?
unless( `grep $bin $Repo/$file` ) {
-case $PERL_CONFIG_SH 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."; exit 1
- fi
- . $TOP/config.sh
- ;;
-esac
-: This forces SH files to create target in same directory as SH file.
-: This is so that make depend always knows where to find SH derivatives.
-case "$0" in
-*/Makefile.SH) cd `expr X$0 : 'X\(.*\)/'` ;;
-Makefile.SH) ;;
-*) case `pwd` in
- */utils) ;;
- *) if test -d utils; then cd utils
- else echo "Can't figure out where to write output."; exit 1
- fi;;
- esac;;
-esac
-
-echo "Extracting utils/Makefile (with variable substitutions)"
-rm -f Makefile
+#!./miniperl -w
+use strict;
+use Config;
+
+if (@ARGV) {
+ my $dir = shift;
+ chdir $dir or die "Can't chdir '$dir': $!";
+}
+
+require 'regen/regen_lib.pl';
+
+my $target = 'utils/Makefile';
+print "Extracting $target (with variable substitutions)\n";
+my $fh = open_new($target, undef, undef, 1);
+
# These use the Cwd extension. For statically-built perls, we
# need perl, not just miniperl.
# These use the Cwd extension. For statically-built perls, we
# need perl, not just miniperl.
-case "$usedl" in
- define) perl="../miniperl" ;;
- *) perl="../perl" ;;
-esac
-cat >Makefile <<!GROK!THIS!
+my $perl = defined $Config{usedl} ? '../miniperl' : '../perl';
+
+print $fh <<"EOT";
# Generated from utils/Makefile.SH. The generated file is
# shipped with the source kit for systems such as win32
# which don't do .SH extraction.
PERL = $perl
REALPERL = ../perl
# Generated from utils/Makefile.SH. The generated file is
# shipped with the source kit for systems such as win32
# which don't do .SH extraction.
PERL = $perl
REALPERL = ../perl
-RUN = $run # Used mainly cross-compilation setups.
+RUN = $Config{run} # Used mainly cross-compilation setups.
-cat >>Makefile <<'!NO!SUBS!'
# Files to be built with variable substitution after miniperl is
# available. Dependencies handled manually below (for now).
# Files to be built with variable substitution after miniperl is
# available. Dependencies handled manually below (for now).
veryclean: distclean
-rm -f *~ *.org
veryclean: distclean
-rm -f *~ *.org
-!NO!SUBS!
-$eunicefix Makefile
-case `pwd` in
-*SH)
- $rm -f ../Makefile
- $ln Makefile ../Makefile
- ;;
-esac
-rm -f $firstmakefile
+EOT
+
+close_and_rename($fh);