cpython: 6911917f1f02 (original) (raw)

Mercurial > cpython

changeset 104004:6911917f1f02

Issue #27950: Silence long makefile commands and comments Gnu Make treats comments in a list of commands as shell comments (not makefile comments), and reports them as shell commands. The space separating the @ and # symbols helps syntax highlighting. [#27950]

Martin Panter vadmium+py@gmail.com
date Thu, 22 Sep 2016 09:34:43 +0000
parents ae6813d21859
children 4261ae29d3e2
files Makefile.pre.in
diffstat 1 files changed, 15 insertions(+), 15 deletions(-)[+] [-] Makefile.pre.in 30

line wrap: on

line diff

--- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -497,7 +497,7 @@ build_all_generate_profile: (MAKE)@DEFMAKERULE@CFLAGSNODIST="(MAKE) @DEF_MAKE_RULE@ CFLAGS_NODIST="(MAKE)@DEFMAKERULE@CFLAGSNODIST="(CFLAGS) (PGOPROFGENFLAG)@LTOFLAGS@"LDFLAGS="(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LDFLAGS="(PGOPROFGENFLAG)@LTOFLAGS@"LDFLAGS="(LDFLAGS) (PGOPROFGENFLAG)@LTOFLAGS@"LIBS="(PGO_PROF_GEN_FLAG) @LTOFLAGS@" LIBS="(PGOPROFGENFLAG)@LTOFLAGS@"LIBS="(LIBS)" run_profile_task: - : # FIXME: can't run for a cross build + @ # FIXME: can't run for a cross build (LLVMPROFFILE)(LLVM_PROF_FILE) (LLVMPROFFILE)(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true build_all_merge_profile: @@ -521,8 +521,8 @@ coverage-lcov: --base-directory (realpath(realpath (realpath(abs_builddir)) [](#l1.13) --path (realpath(realpath (realpath(abs_srcdir)) [](#l1.14) --output-file $(COVERAGE_INFO) - : # remove 3rd party modules, system headers and internal files with - : # debug, test or dummy functions. + @ # remove 3rd party modules, system headers and internal files with + @ # debug, test or dummy functions. @lcov --remove $(COVERAGE_INFO) [](#l1.20) '/Modules/_blake2/impl/' [](#l1.21) '/Modules/_ctypes/libffi/*' [](#l1.22) @@ -546,15 +546,15 @@ coverage-lcov: @echo coverage-report: - : # force rebuilding of parser and importlib + @ # force rebuilding of parser and importlib @touch $(GRAMMAR_INPUT) @touch $(srcdir)/Lib/importlib/_bootstrap.py @touch $(srcdir)/Lib/importlib/_bootstrap_external.py - : # build with coverage info + @ # build with coverage info $(MAKE) coverage - : # run tests, ignore failures + @ # run tests, ignore failures (TESTRUNNER)(TESTRUNNER) (TESTRUNNER)(TESTOPTS) || true - : # build lcov report + @ # build lcov report $(MAKE) coverage-lcov

Run "Argument Clinic" over all source files

@@ -1020,7 +1020,7 @@ testall: all platform

Run the test suite for both architectures in a Universal build on OSX.

Must be run on an Intel box.

testuniversal: all platform - if [ arch != 'i386' ];then [](#l1.47) + @if [ arch != 'i386' ]; then [](#l1.48) echo "This can only be used on OSX/i386" ;[](#l1.49) exit 1 ;[](#l1.50) fi @@ -1343,15 +1343,15 @@ libinstall: build_all $(srcdir)/Modules/ (PYTHONFORBUILD)−mlib2to3.pgen2.driver(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver (PYTHONFORBUILD)mlib2to3.pgen2.driver(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure + @ # Substitution happens here, as the completely-expanded BINDIR + @ # is not available in configure sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py - # Replace makefile compat. variable references with shell script compat. ones; (VAR)−>(VAR) -> (VAR)>{VAR} + @ # Replace makefile compat. variable references with shell script compat. ones; (VAR)−>(VAR) -> (VAR)>{VAR} sed -e 's,$$(([A-Za-z0-9_]*)),$${\1},g' < Misc/python-config.sh >python-config - # On Darwin, always use the python version of the script, the shell - # version doesn't use the compiler customizations that are provided - # in python (_osx_support.py). - if test uname -s = Darwin; then [](#l1.67) + @ # On Darwin, always use the python version of the script, the shell + @ # version doesn't use the compiler customizations that are provided + @ # in python (_osx_support.py). + @if test uname -s = Darwin; then [](#l1.71) cp python-config.py python-config; [](#l1.72) fi