diff options
| author | Alexander Bokovoy <ab@samba.org> | 2012-04-14 08:16:20 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-04-14 08:55:43 +0200 |
| commit | 89e998412fe07a01f9c79330973f62d909dc2da2 (patch) | |
| tree | 956360462288b73443562abd7741a85ecfc8da6f | |
| parent | e109cc54127c3175cd1f41f21ae74c63fe460cae (diff) | |
| download | samba-89e998412fe07a01f9c79330973f62d909dc2da2.tar.gz samba-89e998412fe07a01f9c79330973f62d909dc2da2.tar.bz2 samba-89e998412fe07a01f9c79330973f62d909dc2da2.zip | |
waf: samba-specific methods should have capitalized names, change process_separate_rule to follow
Changing process_separate_rule to PROCESS_SEPARATE_RULE.
Thanks Thomas Nagy for review.
Autobuild-User: Alexander Bokovoy <ab@samba.org>
Autobuild-Date: Sat Apr 14 08:55:43 CEST 2012 on sn-devel-104
| -rw-r--r-- | buildtools/wafsamba/samba_utils.py | 6 | ||||
| -rw-r--r-- | wscript_build | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py index bdf96fef88..477e0b41db 100644 --- a/buildtools/wafsamba/samba_utils.py +++ b/buildtools/wafsamba/samba_utils.py @@ -626,7 +626,7 @@ def get_tgt_list(bld): return tgt_list from Constants import WSCRIPT_FILE -def process_separate_rule(self, rule): +def PROCESS_SEPARATE_RULE(self, rule): ''' cause waf to process additional script based on `rule'. You should have file named wscript_<stage>_rule in the current directory where stage is either 'configure' or 'build' @@ -645,5 +645,5 @@ def process_separate_rule(self, rule): dc = self.pre_recurse(txt, file_path, []) exec(compile(txt, file_path, 'exec'), dc) -Build.BuildContext.process_separate_rule = process_separate_rule -ConfigurationContext.process_separate_rule = process_separate_rule +Build.BuildContext.PROCESS_SEPARATE_RULE = PROCESS_SEPARATE_RULE +ConfigurationContext.PROCESS_SEPARATE_RULE = PROCESS_SEPARATE_RULE diff --git a/wscript_build b/wscript_build index eeefeb3a19..ad790ca506 100644 --- a/wscript_build +++ b/wscript_build @@ -118,11 +118,11 @@ if bld.CONFIG_SET("USING_SYSTEM_KRB5"): # When both HEIMDAL_KRB5_CONFIG and KRB5_CONFIG are set and not equal, # it means one is Heimdal-specific (krb5-config.heimdal, for example) # and there is system heimdal - bld.process_separate_rule('system_heimdal') + bld.PROCESS_SEPARATE_RULE('system_heimdal') else: - bld.process_separate_rule('system_krb5') + bld.PROCESS_SEPARATE_RULE('system_krb5') else: - bld.process_separate_rule('embedded_heimdal') + bld.PROCESS_SEPARATE_RULE('embedded_heimdal') bld.RECURSE('libcli/smbreadline') bld.RECURSE('codepages') |