buildtools: Fix code spelling

Best reviewed with: `git show --word-diff`

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Rowland Penny <rpenny@samba.org>

diff --git a/buildtools/examples/run_on_target.py b/buildtools/examples/run_on_target.py
index 79c57308ad0df48b13bde45454f0677dcc78ef81..0c9ac5a6a183f1faecdc37f44dd5bf106c266536 100755 (executable)
--- a/buildtools/examples/run_on_target.py
+++ b/buildtools/examples/run_on_target.py
@@ -38,7 +38,7 @@ import os
 import subprocess
 from optparse import OptionParser
 
-# those are defaults, but can be overidden using command line
+# these are defaults, but can be overridden using command line
 SSH = 'ssh'
 USER = None
 HOST = 'localhost'

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index f429ad2d487249d541766bf5fd4f40ed6d056259..75d5f4acbcc348b1b07fe49ec529a7b2bf23d1b5 100644 (file)
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -982,7 +982,7 @@ def SETUP_CONFIGURE_CACHE(conf, enable):
     '''enable/disable cache of configure results'''
     if enable:
         # when -C is chosen, we will use a private cache and will
-        # not look into system includes. This roughtly matches what
+        # not look into system includes. This roughly matches what
         # autoconf does with -C
         cache_path = os.path.join(conf.bldnode.abspath(), '.confcache')
         mkdir_p(cache_path)

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index c7b7246e0d6a9a8c85e44428ff62296c05006ebf..2300565b2e4b43abf571573b4da0b5f7b9f7595a 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -57,7 +57,7 @@ Options.OptionsContext.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_DEFAULT
 
 
 def minimum_library_version(conf, libname, default):
-    '''allow override of mininum system library version'''
+    '''allow override of minimum system library version'''
 
     minlist = Options.options.MINIMUM_LIBRARY_VERSION
     if not minlist:

diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index bd309adb0dddea2ec4286eac49f3d74409960bf7..c5e3fc9ecf63e946c034c6c3ec99acccda5ca4a2 100644 (file)
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -36,7 +36,7 @@ def check(self, *k, **kw):
                  if d:
                      additional_dirs.append(d)
 
-    # we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
+    # we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
     def add_options_dir(dirs, env):
         for x in dirs:
              if not x in env.CPPPATH:

diff --git a/buildtools/wafsamba/samba_headers.py b/buildtools/wafsamba/samba_headers.py
index 78f57772a8201d7a22e3e02a9f762f3d3d916d9f..37147a95328f8e3ef9c564ce039a194628578e9a 100644 (file)
--- a/buildtools/wafsamba/samba_headers.py
+++ b/buildtools/wafsamba/samba_headers.py
@@ -132,7 +132,7 @@ def PUBLIC_HEADERS(bld, public_headers, header_path=None, public_headers_install
     bld.SET_BUILD_GROUP('final')
 
     if not bld.env.build_public_headers:
-        # in this case no header munging neeeded. Used for tdb, talloc etc
+        # in this case no header munging needed. Used for tdb, talloc etc
         public_headers_simple(bld, public_headers, header_path=header_path,
                               public_headers_install=public_headers_install)
         return

diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index a7ba2ac4d0dfb2995c362b1925af313ef57a2244..39512f0ac9639680bf82eaaac3832ce98d439734 100644 (file)
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -327,7 +327,7 @@ def EXPAND_VARIABLES(ctx, varstr, vars=None):
 
     env = ConfigSet.ConfigSet()
     ret = varstr
-    # substitute on user supplied dict if avaiilable
+    # substitute on user supplied dict if available
     if vars is not None:
         for v in vars.keys():
             env[v] = vars[v]

diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py
index cfdceea14ca4b7065c53f6c6ccf95823f3ba1b33..54444b3ab68f00921a6640d3944c2df2c9faa90e 100644 (file)
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -148,7 +148,7 @@ Build.BuildContext.AUTOCLEANUP_STALE_FILES = Utils.nada
 def check(self, *k, **kw):
     '''Override the waf defaults to inject --with-directory options'''
 
-    # match the configuration test with speficic options, for example:
+    # match the configuration test with specific options, for example:
     # --with-libiconv -> Options.options.iconv_open -> "Checking for library iconv"
     self.validate_c(kw)
 
@@ -161,7 +161,7 @@ def check(self, *k, **kw):
                  if d:
                      additional_dirs.append(d)
 
-    # we add the additional dirs twice: once for the test data, and again if the compilation test suceeds below
+    # we add the additional dirs twice: once for the test data, and again if the compilation test succeeds below
     def add_options_dir(dirs, env):
         for x in dirs:
              if not x in env.CPPPATH:

diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 5fbc0723927a97e4d2faa91c4767fec45dfd9306..99e121c372c0440778e70706d6b40d331f04368e 100644 (file)
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -436,7 +436,7 @@ def check_syslib_collisions(bld, tgt_list):
 
 
 def check_dependencies(bld, t):
-    '''check for depenencies that should be changed'''
+    '''check for dependencies that should be changed'''
 
     if bld.get_tgen_by_name(t.sname + ".objlist"):
         return

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9ee158b1f39afc39cce202d88bca763966d2318a..47ed3f71234d021f91a08e153965dc0289cac249 100644 (file)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -118,7 +118,7 @@ Use this with extreme care
                    action="store_true", dest='disable_rpath_private_install', default=False)
     gr.add_option('--nonshared-binary',
                    help=(
-f'''Disable use of shared libaries internal to {Context.g_module.APPNAME} for the listed binaries.
+f'''Disable use of shared libraries internal to {Context.g_module.APPNAME} for the listed binaries.
 
 The resulting binaries are 'statically linked' with regard to components provided by
 {Context.g_module.APPNAME}, but remain dynamically linked to (eg) libc.so and libgnutls.so
@@ -528,7 +528,8 @@ def configure(conf):
             strict=True,
             msg='Checking for __attribute__')
 
-    # Solaris by defauls uses draft versions of some functions unless you set _POSIX_PTHREAD_SEMANTICS
+    # Solaris by default uses draft versions of some functions unless you set
+    # _POSIX_PTHREAD_SEMANTICS
     if sys.platform.startswith('sunos'):
         conf.DEFINE('_POSIX_PTHREAD_SEMANTICS', 1)