This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8318

setup: build C extensions with -Werror=declaration-after-statement
ClosedPublic

Authored by mharbison72 on Mar 20 2020, 11:55 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG2a98b0cd4995: setup: build C extensions with -Werror=declaration-after-statement
Summary

MSVC 2008 still needs declarations at the top of the scope. I added it to the
3rd party code too in case somebody vendors a new version with a problem-
they'll get an early warning. Clang seems to ignore this (at least on 10.14
with Xcode 10), and gcc 7.4 will error out as desired on Ubuntu 18.04. Thanks
to Yuya for remembering the name of the option.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

mharbison72 created this revision.Mar 20 2020, 11:55 PM
marmoute accepted this revision.Mar 21 2020, 12:02 AM
yuja added a subscriber: yuja.Mar 21 2020, 12:55 AM
MSVC 2008 still needs declarations at the top of the scope.

Can you copy this to the code so we can recall why we enable this weird
warning option?

+if os.name != 'nt':
+ common_cflags = ['-Werror=declaration-after-statement']

mharbison72 added a commit: rHG2a98b0cd4995: setup: build C extensions with -Werror=declaration-after-statement.Mar 24 2020, 8:56 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2a98b0cd4995: setup: build C extensions with -Werror=declaration-after-statement (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (26 lines)

Diff 20866

setup.py

common_depends = [ common_depends = [
'mercurial/bitmanipulation.h', 'mercurial/bitmanipulation.h',
'mercurial/compat.h', 'mercurial/compat.h',
'mercurial/cext/util.h', 'mercurial/cext/util.h',
] ]
common_include_dirs = ['mercurial'] common_include_dirs = ['mercurial']
common_cflags = []
# MSVC 2008 still needs declarations at the top of the scope.
if os.name != 'nt':
common_cflags = ['-Werror=declaration-after-statement']
osutil_cflags = [] osutil_cflags = []
osutil_ldflags = [] osutil_ldflags = []
# platform specific macros # platform specific macros
for plat, func in [('bsd', 'setproctitle')]: for plat, func in [('bsd', 'setproctitle')]:
if re.search(plat, sys.platform) and hasfunction(new_compiler(), func): if re.search(plat, sys.platform) and hasfunction(new_compiler(), func):
osutil_cflags.append('-DHAVE_%s' % func.upper()) osutil_cflags.append('-DHAVE_%s' % func.upper())
) )
extmodules = [ extmodules = [
Extension( Extension(
'mercurial.cext.base85', 'mercurial.cext.base85',
['mercurial/cext/base85.c'], ['mercurial/cext/base85.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.cext.bdiff', 'mercurial.cext.bdiff',
['mercurial/bdiff.c', 'mercurial/cext/bdiff.c'] + xdiff_srcs, ['mercurial/bdiff.c', 'mercurial/cext/bdiff.c'] + xdiff_srcs,
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers, depends=common_depends + ['mercurial/bdiff.h'] + xdiff_headers,
), ),
Extension( Extension(
'mercurial.cext.mpatch', 'mercurial.cext.mpatch',
['mercurial/mpatch.c', 'mercurial/cext/mpatch.c'], ['mercurial/mpatch.c', 'mercurial/cext/mpatch.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.cext.parsers', 'mercurial.cext.parsers',
[ [
'mercurial/cext/charencode.c', 'mercurial/cext/charencode.c',
'mercurial/cext/dirs.c', 'mercurial/cext/dirs.c',
'mercurial/cext/manifest.c', 'mercurial/cext/manifest.c',
'mercurial/cext/parsers.c', 'mercurial/cext/parsers.c',
'mercurial/cext/pathencode.c', 'mercurial/cext/pathencode.c',
'mercurial/cext/revlog.c', 'mercurial/cext/revlog.c',
], ],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=common_cflags,
depends=common_depends depends=common_depends
+ ['mercurial/cext/charencode.h', 'mercurial/cext/revlog.h',], + ['mercurial/cext/charencode.h', 'mercurial/cext/revlog.h',],
), ),
Extension( Extension(
'mercurial.cext.osutil', 'mercurial.cext.osutil',
['mercurial/cext/osutil.c'], ['mercurial/cext/osutil.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
extra_compile_args=osutil_cflags, extra_compile_args=common_cflags + osutil_cflags,
extra_link_args=osutil_ldflags, extra_link_args=osutil_ldflags,
depends=common_depends, depends=common_depends,
), ),
Extension( Extension(
'mercurial.thirdparty.zope.interface._zope_interface_coptimizations', 'mercurial.thirdparty.zope.interface._zope_interface_coptimizations',
[ [
'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c', 'mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.c',
], ],
extra_compile_args=common_cflags,
), ),
Extension( Extension(
'mercurial.thirdparty.sha1dc', 'mercurial.thirdparty.sha1dc',
[ [
'mercurial/thirdparty/sha1dc/cext.c', 'mercurial/thirdparty/sha1dc/cext.c',
'mercurial/thirdparty/sha1dc/lib/sha1.c', 'mercurial/thirdparty/sha1dc/lib/sha1.c',
'mercurial/thirdparty/sha1dc/lib/ubc_check.c', 'mercurial/thirdparty/sha1dc/lib/ubc_check.c',
], ],
extra_compile_args=common_cflags,
), ),
Extension( Extension(
'hgext.fsmonitor.pywatchman.bser', ['hgext/fsmonitor/pywatchman/bser.c'] 'hgext.fsmonitor.pywatchman.bser',
['hgext/fsmonitor/pywatchman/bser.c'],
extra_compile_args=common_cflags,
), ),
RustStandaloneExtension( RustStandaloneExtension(
'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3' 'mercurial.rustext', 'hg-cpython', 'librusthg', py3_features='python3'
), ),
] ]
sys.path.insert(0, 'contrib/python-zstandard') sys.path.insert(0, 'contrib/python-zstandard')
import setup_zstd import setup_zstd
extmodules.append( zstd = setup_zstd.get_c_extension(
setup_zstd.get_c_extension(
name='mercurial.zstd', root=os.path.abspath(os.path.dirname(__file__)) name='mercurial.zstd', root=os.path.abspath(os.path.dirname(__file__))
) )
) zstd.extra_compile_args += common_cflags
extmodules.append(zstd)
try: try:
from distutils import cygwinccompiler from distutils import cygwinccompiler
# the -mno-cygwin option has been deprecated for years # the -mno-cygwin option has been deprecated for years
mingw32compilerclass = cygwinccompiler.Mingw32CCompiler mingw32compilerclass = cygwinccompiler.Mingw32CCompiler
class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler): class HackedMingw32CCompiler(cygwinccompiler.Mingw32CCompiler):