In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/34b80e25c2b4f9caa86740b592c7c7dfdc78f44e?hp=1e54784419d7044304e71755f9e6de321eb1f5f8>
- Log ----------------------------------------------------------------- commit 34b80e25c2b4f9caa86740b592c7c7dfdc78f44e Author: Jesse Vincent <[email protected]> Date: Mon Oct 19 13:03:40 2009 -0400 macroify how we run perl from within the Makefile. M Makefile.SH commit 2d9ede6ef2fdbb320bb4724d8f00e52563dbcf58 Author: Jerry D. Hedden <[email protected]> Date: Mon Oct 19 10:20:49 2009 -0400 Add Cygwin to supported platforms list M pod/perlport.pod commit 1f9a80b25f23becc955475300dbdd453eebdacba Author: Jesse Vincent <[email protected]> Date: Mon Oct 19 12:45:21 2009 -0400 Porting/makerel no longer massages win32 files during the final tarball build process I _believe_ that this change will mean that our shipped tarball will contain all files exactly as they are in the repo - The only difference will be in file permissions. I'm told that git can version the execute bit on files. If I'm feeling especially adventurous, I may write a porting test to ensure that the right files (and only the right files?) are marked +x in git and then remove that bit from Porting/makerel. I wouldn't mind it if someone beat me to that. M Porting/makerel ----------------------------------------------------------------------- Summary of changes: Makefile.SH | 83 ++++++++++++++++++++++++++++-------------------------- Porting/makerel | 24 --------------- pod/perlport.pod | 2 + 3 files changed, 45 insertions(+), 64 deletions(-) diff --git a/Makefile.SH b/Makefile.SH index c29d0be..8b8ac2c 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1,4 +1,3 @@ -#! /bin/sh case $PERL_CONFIG_SH in '') if test -f config.sh @@ -312,7 +311,11 @@ PATH_SEP = $p_ MINIPERL_EXE = miniperl\$(EXE_EXT) MINIPERL = \$(LDLIBPTH) \$(RUN) ./miniperl\$(EXE_EXT) -Ilib -# +# Macros to invoke a copy of our fully operational perl during the build. +PERL_EXE = perl\$(EXE_EXT) +RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT) + + dynamic_ext = $dynamic_list dynamic_ext_re = $dynamic_ext_re static_ext = $static_list @@ -322,7 +325,7 @@ DYNALOADER = DynaLoader\$(OBJ_EXT) libs = $perllibs $cryptlib -public = perl\$(EXE_EXT) utilities translators +public = \$(PERL_EXE) utilities translators shellflags = $shellflags @@ -824,19 +827,19 @@ $(MINIPERL_EXE): $& miniperlmain$(OBJ_EXT) $(mini_obj) opmini$(OBJ_EXT) perlmini $spitshell >>$Makefile <<'!NO!SUBS!' -perl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) +$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) -...@rm -f miniperl.xok $(SHRPENV) $(LDLIBPTH) $(CC) -o perl$(PERL_SUFFIX) $(PERL_PROFILE_LDFLAGS) $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Purify/Quantify Perls. -pureperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) +pure$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purify $(CC) -o pureperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -purecovperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) +purecov$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) purecov $(CC) -o purecovperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) -quantperl$(EXE_EXT): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) +quant$(PERL_EXE): $& perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) quantify $(CC) -o quantperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) # Valgrind perl (currently Linux only) @@ -984,11 +987,11 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext) $(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -w touch uni.data -# perl$(EXE_EXT) and ext because buildtoc uses Text::Wrap uses re +# $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re # But also this ensures that all extensions are built before we try to scan # them, which picks up Devel::PPPort's documentation. -pod/perltoc.pod: $(perltoc_pod_prereqs) perl$(EXE_EXT) $(ext) pod/buildtoc - $(LDLIBPTH) $(RUN) ./perl$(EXE_EXT) -f -Ilib pod/buildtoc --build-toc -q +pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc + $(RUN_PERL) -f -Ilib pod/buildtoc --build-toc -q pod/perlapi.pod pod/perlintern.pod: $(MINIPERL_EXE) autodoc.pl embed.fnc $(MINIPERL) autodoc.pl @@ -1008,20 +1011,20 @@ extra.pods: $(MINIPERL_EXE) echo "pod/perl"$$nx".pod" >> extra.pods ; \ done -extras.make: perl$(EXE_EXT) - -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` +extras.make: $(PERL_EXE) + -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&make(@ARGV)' `cat extras.lst` -extras.test: perl$(EXE_EXT) - -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` +extras.test: $(PERL_EXE) + -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&test(@ARGV)' `cat extras.lst` -extras.install: perl$(EXE_EXT) - -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` +extras.install: $(PERL_EXE) + -...@test ! -s extras.lst || PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib -MCPAN -e '@ARGV&&install(@ARGV)' `cat extras.lst` .PHONY: install install-strip install-all install-verbose install-silent \ no-install install.perl install.man install.html META.yml: Porting/makemeta Porting/Maintainers.pl Porting/Maintainers.pm - PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(LDLIBPTH) $(RUN) ./perl -Ilib Porting/makemeta + PATH="`pwd`:${PATH}" PERL5LIB="`pwd`/lib" $(RUN_PERL) -Ilib Porting/makemeta install-strip: $(MAKE) STRIPFLAGS=-s install DESTDIR="$(DESTDIR)" @@ -1042,17 +1045,17 @@ no-install: INSTALL_DEPENDENCE = all install.perl: $(INSTALL_DEPENDENCE) installperl - $(LDLIBPTH) $(RUN) ./perl installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) + $(RUN_PERL) installperl --destdir=$(DESTDIR) $(INSTALLFLAGS) $(STRIPFLAGS) -...@test ! -s extras.lst || $(MAKE) extras.install install.man: all installman - $(LDLIBPTH) $(RUN) ./perl installman --destdir=$(DESTDIR) $(INSTALLFLAGS) + $(RUN_PERL) installman --destdir=$(DESTDIR) $(INSTALLFLAGS) # XXX Experimental. Hardwired values, but useful for testing. # Eventually Configure could ask for some of these values. install.html: all installhtml -...@test -f README.vms && cd vms && $(LNS) ../README.vms README_vms.pod && cd .. - $(LDLIBPTH) $(RUN) ./perl installhtml \ + $(RUN_PERL) installhtml \ --podroot=. --podpath=. --recurse \ --htmldir=$(privlib)/html \ --htmlroot=$(privlib)/html \ @@ -1164,7 +1167,7 @@ $spitshell >>$Makefile <<'!NO!SUBS!' .PHONY: printconfig printconfig: - @eval `$(LDLIBPTH) $(RUN) ./perl -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR) + @eval `$(RUN_PERL) -Ilib -V:$(CONFIGVAR)`; echo $$$(CONFIGVAR) .PHONY: clean _tidy _mopup _cleaner1 _cleaner2 \ realclean _realcleaner clobber _clobber \ @@ -1201,7 +1204,7 @@ _mopup: -rm -f perl.pixie lib*.so.perl.pixie lib*.so.Addrs -rm -f perl.Addrs perl.Counts t/perl.Addrs t/perl.Counts *perl.xok -rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump - -rm -f perl$(EXE_EXT) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl + -rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl -rm -f opcode.h-old opnames.h-old pp.sym-old pp_proto.h-old -rm -f config.arch config.over $(DTRACE_H) runtests @@ -1237,7 +1240,7 @@ _cleaner1: _cleaner2: -rm -f core.*perl.*.? t/core.perl.*.? .?*.c rm -f core *perl.core t/core t/*perl.core core.* t/core.* - rm -f t/misctmp* t/forktmp* t/tmp* t/c t/perl$(EXE_EXT) t/rantests + rm -f t/misctmp* t/forktmp* t/tmp* t/c t/$(PERL_EXE) t/rantests rm -f so_locations $(LIBPERL_NONSHR) $(MINIPERL_NONSHR) rm -rf $(addedbyconf) rm -f $(FIRSTMAKEFILE) $(FIRSTMAKEFILE).old makefile.old @@ -1325,12 +1328,12 @@ _test: test_prep_pre: preplibrary utilities $(nonxs_ext) -test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) perl$(EXE_EXT) $(dynamic_ext) $(TEST_PERL_DLL) - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) +test_prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) $(dynamic_ext) $(TEST_PERL_DLL) + cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) -test_prep_reonly: $(MINIPERL_EXE) perl$(EXE_EXT) $(dynamic_ext_re) $(TEST_PERL_DLL) +test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL) $(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../perl$(EXE_EXT) perl$(EXE_EXT)) + cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE)) test check: test_prep ./runtests choose @@ -1361,8 +1364,8 @@ test.torture torturetest: test_prep # Targets for UTF16 testing: minitest.utf16: minitest.prep - - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../$(MINIPERL_EXE) perl$(EXE_EXT)) \ - && $(LDLIBPTH) $(RUN) ./perl TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty + - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ + && $(RUN_PERL) TEST -minitest -utf16 base/*.t comp/*.t cmd/*.t run/*.t io/*.t op/*.t uni/*.t </dev/tty test.utf16 check.utf16: test_prep TEST_ARGS=-utf16 ./runtests choose @@ -1420,8 +1423,8 @@ minitest.prep: # Can't depend on lib/Config.pm because that might be where miniperl # is crashing. minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep - - cd t && (rm -f perl$(EXE_EXT); $(LNS) ../$(MINIPERL_EXE) perl$(EXE_EXT)) \ - && $(LDLIBPTH) $(RUN) ./perl TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty + - cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \ + && $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty # Test via harness @@ -1438,7 +1441,7 @@ test-reonly: test_prep_reonly # Porting tests (well-formedness of pod, manifest, etc) test_porting: test_prep - cd t && $(LDLIBPTH) $(RUN) ./perl$(EXE_EXT) harness porting/*.t + cd t && $(RUN_PERL) harness porting/*.t # Handy way to run perlbug -ok without having to install and run the # installed perlbug. We don't re-run the tests here - we trust the user. @@ -1448,28 +1451,28 @@ test_porting: test_prep .PHONY: ok okfile oknack okfilenack nok nokfile noknack nokfilenack ok: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' + $(RUN_PERL) -Ilib utils/perlbug -ok -s '(UNINSTALLED)' okfile: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok + $(RUN_PERL) -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok oknack: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -A + $(RUN_PERL) -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -A okfilenack: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok -A + $(RUN_PERL) -Ilib utils/perlbug -ok -s '(UNINSTALLED)' -F perl.ok -A nok: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' + $(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' nokfile: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok + $(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok noknack: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -A + $(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -A nokfilenack: utilities - $(LDLIBPTH) $(RUN) ./perl -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A + $(RUN_PERL) -Ilib utils/perlbug -nok -s '(UNINSTALLED)' -F perl.nok -A .PHONY: clist hlist shlist pllist diff --git a/Porting/makerel b/Porting/makerel index 5e7a362..e4dfdef 100644 --- a/Porting/makerel +++ b/Porting/makerel @@ -170,30 +170,6 @@ my @writables = qw( system("chmod +w @writables") == 0 or die "system: $!"; -print "Adding CRs to DOSish files...\n"; -# This list is also in curliff.pl. -my @crlf = qw( - djgpp/configure.bat - README.ce - README.dos - README.symbian - README.win32 - symbian/config.pl - symbian/makesis.pl - symbian/README - symbian/xsbuild.pl - win32/Makefile - win32/Makefile.ce - win32/ce-helpers/compile-all.bat - win32/ce-helpers/compile.bat - win32/ce-helpers/registry.bat - win32/distclean.bat - win32/makefile.mk -); -system("perl -pi -e 's/\\015*\\012/\\015\\012/' @crlf") == 0 - or die "system: $!"; -print "\n"; - chdir ".." or die $!; my $src = (-e $perl) ? $perl : 'perl'; # 'perl' in maint branch diff --git a/pod/perlport.pod b/pod/perlport.pod index 3f9e918..9bb18c5 100644 --- a/pod/perlport.pod +++ b/pod/perlport.pod @@ -2051,6 +2051,8 @@ at http://www.cpan.org/src =back +=item Cygwin + =item Solaris (x86, SPARC) =item OpenVMS (which versions?) -- Perl5 Master Repository
