waf: Rename some BUNDLED_ functios to PRIVATE_.

diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index e5310dae3d68e658a7b1b85ffc33e8d903ee9fb4..d395b82008986e37c2fb98a84ef2cf736edd7903 100644 (file)
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -4,13 +4,13 @@ from Configure import conf
 import Logs
 from samba_utils import *
 
-def BUNDLED_NAME(bld, name, bundled_extension, private_library):
+def PRIVATE_NAME(bld, name, bundled_extension, private_library):
     '''possibly rename a library to include a bundled extension'''
     if bld.env.DISABLE_SHARED or not bundled_extension:
         return name
-    if name in bld.env.BUNDLED_EXTENSION_EXCEPTION and not private_library:
+    if name in bld.env.PRIVATE_EXTENSION_EXCEPTION and not private_library:
         return name
-    extension = getattr(bld.env, 'BUNDLED_EXTENSION', '')
+    extension = getattr(bld.env, 'PRIVATE_EXTENSION', '')
     if extension:
         return name + '-' + extension
     return name
@@ -46,13 +46,13 @@ def BUILTIN_DEFAULT(opt, builtins):
 Options.Handler.BUILTIN_DEFAULT = BUILTIN_DEFAULT
 
 
-def BUNDLED_EXTENSION_DEFAULT(opt, extension, noextension=''):
-    '''set a default bundled library extension'''
-    if 'BUNDLED_EXTENSION_DEFAULT' in Options.options:
+def PRIVATE_EXTENSION_DEFAULT(opt, extension, noextension=''):
+    '''set a default private library extension'''
+    if 'PRIVATE_EXTENSION_DEFAULT' in Options.options:
         return
-    Options.options['BUNDLED_EXTENSION_DEFAULT'] = extension
-    Options.options['BUNDLED_EXTENSION_EXCEPTION'] = noextension
-Options.Handler.BUNDLED_EXTENSION_DEFAULT = BUNDLED_EXTENSION_DEFAULT
+    Options.options['PRIVATE_EXTENSION_DEFAULT'] = extension
+    Options.options['PRIVATE_EXTENSION_EXCEPTION'] = noextension
+Options.Handler.PRIVATE_EXTENSION_DEFAULT = PRIVATE_EXTENSION_DEFAULT
 
 
 def minimum_library_version(conf, libname, default):

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 710871555580bf3e93664ea032c1f49e1c4c47d7..eb0c3696cb8c7dc76f520c3156a4ba039ceacafc 100644 (file)
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -179,7 +179,7 @@ def SAMBA_LIBRARY(bld, libname, source,
         while bundled_name.startswith("lib"):
             bundled_name = bundled_name[3:]
     else:
-        bundled_name = BUNDLED_NAME(bld, libname, bundled_extension, private_library)
+        bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, private_library)
 
     features = 'cc cshlib symlink_lib install_lib'
     if target_type == 'PYTHON':

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9dc6910fdadc0ee0ffbc7b2c37779371513de8d9..d705216ba7530942719a9b804d98d749a5dc7cc3 100644 (file)
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -27,15 +27,15 @@ def set_options(opt):
                    help=("comma separated list of bundled libraries. May include !LIBNAME to disable bundling a library. Can be 'NONE' or 'ALL' [auto]"),
                    action="store", dest='BUNDLED_LIBS', default='')
 
-    extension_default = Options.options['BUNDLED_EXTENSION_DEFAULT']
-    gr.add_option('--bundled-library-extension',
-                   help=("name extension for bundled libraries [%s]" % extension_default),
-                   action="store", dest='BUNDLED_EXTENSION', default=extension_default)
+    extension_default = Options.options['PRIVATE_EXTENSION_DEFAULT']
+    gr.add_option('--private-library-extension',
+                   help=("name extension for private libraries [%s]" % extension_default),
+                   action="store", dest='PRIVATE_EXTENSION', default=extension_default)
 
-    extension_exception = Options.options['BUNDLED_EXTENSION_EXCEPTION']
-    gr.add_option('--bundled-extension-exception',
-                   help=("comman separated list of libraries to not apply extension to [%s]" % extension_exception),
-                   action="store", dest='BUNDLED_EXTENSION_EXCEPTION', default=extension_exception)
+    extension_exception = Options.options['PRIVATE_EXTENSION_EXCEPTION']
+    gr.add_option('--private-extension-exception',
+                   help=("comma separated list of libraries to not apply extension to [%s]" % extension_exception),
+                   action="store", dest='PRIVATE_EXTENSION_EXCEPTION', default=extension_exception)
 
     builtin_defauilt = Options.options['BUILTIN_LIBRARIES_DEFAULT']
     gr.add_option('--builtin-libraries',
@@ -202,8 +202,8 @@ def configure(conf):
     conf.env.DISABLE_SHARED = Options.options.disable_shared
     conf.env.NONSHARED_BINARIES = Options.options.NONSHARED_BINARIES.split(',')
 
-    conf.env.BUNDLED_EXTENSION = Options.options.BUNDLED_EXTENSION
-    conf.env.BUNDLED_EXTENSION_EXCEPTION = Options.options.BUNDLED_EXTENSION_EXCEPTION.split(',')
+    conf.env.PRIVATE_EXTENSION = Options.options.PRIVATE_EXTENSION
+    conf.env.PRIVATE_EXTENSION_EXCEPTION = Options.options.PRIVATE_EXTENSION_EXCEPTION.split(',')
 
     conf.env.CROSS_COMPILE = Options.options.CROSS_COMPILE
     conf.env.CROSS_EXECUTE = Options.options.CROSS_EXECUTE

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 95cbb3752015f988c331ffac41f9d016374cb122..8786eca872c34480b04eb49cb1e0c50d576351a5 100644 (file)
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -20,7 +20,7 @@ samba_dist.DIST_DIRS('lib/replace buildtools:buildtools')
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('NONE')
-    opt.BUNDLED_EXTENSION_DEFAULT('')
+    opt.PRIVATE_EXTENSION_DEFAULT('')
     opt.RECURSE('buildtools/wafsamba')
 
 @wafsamba.runonce

diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index bdf21a347bee372966b0a8e677f4af051f9e5441..56de6eabc787ed6b9575a0e27701a5b259d3ab92 100644 (file)
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -24,7 +24,7 @@ samba_dist.DIST_DIRS('lib/talloc:. lib/replace:lib/replace buildtools:buildtools
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextension='talloc')
+    opt.PRIVATE_EXTENSION_DEFAULT('talloc', noextension='talloc')
     opt.RECURSE('lib/replace')
     opt.add_option('--enable-talloc-compat1',
                    help=("Build talloc 1.x.x compat library [False]"),

diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 5c2ecafd72c9ea639cbb89eae5599b2693dece10..37af34c2f5cd1ca6589c495dbd523f525f54df6d 100644 (file)
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -19,7 +19,7 @@ samba_dist.DIST_DIRS('lib/tdb:. lib/replace:lib/replace buildtools:buildtools')
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextension='tdb')
+    opt.PRIVATE_EXTENSION_DEFAULT('tdb', noextension='tdb')
     opt.RECURSE('lib/replace')
     if opt.IN_LAUNCH_DIR():
         opt.add_option('--disable-python',

diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index 43d23e54c4a1a10f5b2f43c936ca32ac8171f5eb..a5028601004098cbb01f79ce83e99abb96683338 100644 (file)
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -19,7 +19,7 @@ samba_dist.DIST_DIRS('lib/tevent:. lib/replace:lib/replace lib/talloc:lib/talloc
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextension='tevent')
+    opt.PRIVATE_EXTENSION_DEFAULT('tevent', noextension='tevent')
     opt.RECURSE('lib/replace')
     opt.RECURSE('lib/talloc')
     if opt.IN_LAUNCH_DIR():

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index e67ff9482fce8c935e14a87437abecb4661a9605..1fe3547eafdaf9fc69a5e3be2832e3298664ce73 100644 (file)
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -22,7 +22,7 @@ samba_dist.DIST_DIRS('''source4/lib/ldb:. lib/replace:lib/replace lib/talloc:lib
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextension='ldb')
+    opt.PRIVATE_EXTENSION_DEFAULT('ldb', noextension='ldb')
     opt.RECURSE('lib/tdb')
     opt.RECURSE('lib/tevent')
     opt.RECURSE('lib/replace')

diff --git a/source4/wscript b/source4/wscript
index de84a09fa16ea8b8bde075cbf493376c7a278e44..10c53a3d21ebdbe5c4911d818467616dc14ed9d5 100644 (file)
--- a/source4/wscript
+++ b/source4/wscript
@@ -42,7 +42,7 @@ Options.default_prefix = '/usr/local/samba'
 
 def set_options(opt):
     opt.BUILTIN_DEFAULT('replace')
-    opt.BUNDLED_EXTENSION_DEFAULT('samba4')
+    opt.PRIVATE_EXTENSION_DEFAULT('samba4')
     opt.RECURSE('../lib/replace')
     opt.RECURSE('dynconfig')
     opt.RECURSE('scripting/python')