[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Aug 6 07:51:02 UTC 2019
The branch, master has been updated
via bed7fc5a1b5 wafsamba: change --picky-developer into --disable-warnings-as-errors
via 0df28b3d143 script/autobuild.py: remove explicit --picky-developer"
from 81186651eeb ldb: skip indexes on full_search
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bed7fc5a1b5fbea7664aced72dac08846cce6ebc
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Mar 12 11:48:06 2014 +0100
wafsamba: change --picky-developer into --disable-warnings-as-errors
By default we're using -Werror now if --enable-developer is
specified.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Noel Power <npower at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Aug 6 07:50:14 UTC 2019 on sn-devel-184
commit 0df28b3d143db93971ea7c5253a9caf4a7a9d61e
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Nov 11 14:55:55 2014 +0100
script/autobuild.py: remove explicit --picky-developer"
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Noel Power <npower at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_autoconf.py | 6 +++---
buildtools/wafsamba/wscript | 10 +++-------
script/autobuild.py | 12 ++++++------
3 files changed, 12 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 8e5dfb87102..352b5ca31d3 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -783,9 +783,9 @@ int main(void) {
conf.env['EXTRA_CFLAGS'] = []
conf.env['EXTRA_CFLAGS'].extend(TO_LIST("-Werror=format"))
- if Options.options.picky_developer:
- conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror -Wno-error=deprecated-declarations', testflags=True)
- conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=tautological-compare', testflags=True)
+ if not Options.options.disable_warnings_as_errors:
+ conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Werror -Wno-error=deprecated-declarations', testflags=True)
+ conf.ADD_NAMED_CFLAGS('PICKY_CFLAGS', '-Wno-error=tautological-compare', testflags=True)
if Options.options.fatal_errors:
conf.ADD_CFLAGS('-Wfatal-errors', testflags=True)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 8014716e64e..e5017a4a02f 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -102,17 +102,13 @@ def options(opt):
gr.add_option('--enable-developer',
help=("Turn on developer warnings and debugging"),
action="store_true", dest='developer', default=False)
+ gr.add_option('--disable-warnings-as-errors',
+ help=("Do not treat all warnings as errors (disable -Werror)"),
+ action="store_true", dest='disable_warnings_as_errors', default=False)
opt.add_option('--enable-coverage',
help=("enable options necessary for code coverage "
"reporting on selftest (default=no)"),
action="store_true", dest='enable_coverage', default=False)
- def picky_developer_callback(option, opt_str, value, parser):
- parser.values.developer = True
- parser.values.picky_developer = True
- gr.add_option('--picky-developer',
- help=("Treat all warnings as errors (enable -Werror)"),
- action="callback", callback=picky_developer_callback,
- dest='picky_developer', default=False)
gr.add_option('--fatal-errors',
help=("Stop compilation on first error (enable -Wfatal-errors)"),
action="store_true", dest='fatal_errors', default=False)
diff --git a/script/autobuild.py b/script/autobuild.py
index ef75f507add..0560622ee91 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -156,13 +156,13 @@ defaulttasks = list(builddirs.keys())
if os.environ.get("AUTOBUILD_SKIP_SAMBA_O3", "0") == "1":
defaulttasks.remove("samba-o3")
-ctdb_configure_params = " --enable-developer --picky-developer ${PREFIX}"
-samba_configure_params = " ${ENABLE_COVERAGE} --picky-developer ${PREFIX} --with-profiling-data"
+ctdb_configure_params = " --enable-developer ${PREFIX}"
+samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data"
samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH"
samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
-samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check ${ENABLE_COVERAGE} --enable-debug --picky-developer -C ${PREFIX}"
+samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check ${ENABLE_COVERAGE} --enable-debug -C ${PREFIX}"
samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=cmocka,popt,NONE"
samba_libs_configure_bundled_libs = " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent,!popt"
samba_libs_configure_samba = samba_libs_configure_base + samba_libs_configure_bundled_libs
@@ -459,7 +459,7 @@ tasks = {
("tdb-install", "cd lib/tdb && make install"),
# build samba with cluster support (also building ctdb):
- ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer --picky-developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb"),
+ ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}:$PYTHONPATH PKG_CONFIG_PATH=${PREFIX_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --bundled-libraries=!tdb"),
("samba-make", "make"),
("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT"),
("samba-install", "make install"),
@@ -549,7 +549,7 @@ tasks = {
# shipping a minimal smbd.
"samba-nopython": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "./configure.developer ${ENABLE_COVERAGE} --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
+ ("configure", "./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
("make", "make -j"),
("install", "make install"),
("find-python", "script/find_python.sh ${PREFIX}"),
@@ -585,7 +585,7 @@ tasks = {
# check we can do the same thing using python2
"samba-nopython-py2": [
("random-sleep", random_sleep(300, 900)),
- ("configure", "PYTHON=python2 ./configure.developer ${ENABLE_COVERAGE} --picky-developer ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
+ ("configure", "PYTHON=python2 ./configure.developer ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data --disable-python --without-ad-dc"),
("make", "PYTHON=python2 make -j"),
("install", "PYTHON=python2 make install"),
("find-python", "script/find_python.sh ${PREFIX}"),
--
Samba Shared Repository
More information about the samba-cvs
mailing list