In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/19bf1007743b4337230ad3a4538df4bd94311fc4?hp=1d43193d5d388c2cc55fe51bcb525be40cd80688>
- Log ----------------------------------------------------------------- commit 19bf1007743b4337230ad3a4538df4bd94311fc4 Author: Yves Orton <[email protected]> Date: Thu Dec 25 15:44:14 2014 +0100 automatically sort the MANIFEST if necessary Instead of harrasing people to sort the manifest in our tests, we can just automatically sort the manifest when it changes. That way the tests are actually testing that the auto-sort worked, and not that our devs put the new file in the right place. ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +++ Makefile.SH | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index acd0fc1..96cd2fa 100644 --- a/.gitignore +++ b/.gitignore @@ -163,6 +163,9 @@ veryclean.sh U MANIFEST.new +# this is used to auto-sort the MANIFEST +MANIFEST.srt + # ignore editor droppings *.swp *~ diff --git a/Makefile.SH b/Makefile.SH index 076bfc3..674efb1 100755 --- a/Makefile.SH +++ b/Makefile.SH @@ -311,6 +311,9 @@ PATH_SEP = $p_ MINIPERL_EXE = miniperl\$(EXE_EXT) MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib +# Macros to invoke sort the MANIFEST during build +MANIFEST_SRT = MANIFEST.srt + !GROK!THIS! case "$usecrosscompile$perl" in @@ -563,10 +566,15 @@ splintfiles = $(c1) @echo `$(CCCMDSRC)` -S $*.c @`$(CCCMDSRC)` -S $*.c -all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make +all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafiles) $(public) $(dynamic_ext) $(nonxs_ext) extras.make $(MANIFEST_SRT) @echo " "; @echo " Everything is up to date. Type '$(MAKE) test' to run test suite." +$(MANIFEST_SRT): MANIFEST + @perl Porting/manisort -q || (echo "WARNING: re-sorting MANIFEST"; \ + perl Porting/manisort -q -o MANIFEST; sh -c true) + @touch $(MANIFEST_SRT) + .PHONY: all utilities # Both git_version.h and lib/Config_git.pl are built -- Perl5 Master Repository
