summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-10-23 23:26:43 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-10-23 22:24:06 +0000
commit49ef2888193dd7cc37c3fe0a980b7cc1abdac805 (patch)
tree2d93d741f0a89b389ecb78f511499ca4f620555c /buildtools
parent18103d34e2e965ac77ab023f12caa967c655765a (diff)
downloadsamba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.tar.gz
samba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.tar.bz2
samba-49ef2888193dd7cc37c3fe0a980b7cc1abdac805.zip
waf: Rename some BUNDLED_ functios to PRIVATE_.
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_bundled.py18
-rw-r--r--buildtools/wafsamba/wafsamba.py2
-rw-r--r--buildtools/wafsamba/wscript20
3 files changed, 20 insertions, 20 deletions
diff --git a/buildtools/wafsamba/samba_bundled.py b/buildtools/wafsamba/samba_bundled.py
index e5310dae3d..d395b82008 100644
--- 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 7108715555..eb0c3696cb 100644
--- 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 9dc6910fda..d705216ba7 100644
--- 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