diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-04-02 13:06:35 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:22 +1000 |
| commit | 31a88f266c5b4e884276f92f3801eec4e1033f8d (patch) | |
| tree | dbf59a1ced842479b5fa8eab6e52365b10d4fb1a | |
| parent | 865e478e25e6c9d69915061f6f2211298e730068 (diff) | |
| download | samba-31a88f266c5b4e884276f92f3801eec4e1033f8d.tar.gz samba-31a88f266c5b4e884276f92f3801eec4e1033f8d.tar.bz2 samba-31a88f266c5b4e884276f92f3801eec4e1033f8d.zip | |
build: nicer display of command type for prototypes and generators
| -rw-r--r-- | buildtools/wafsamba/samba_autoproto.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py index ae2eb41a93..5a6460c89a 100644 --- a/buildtools/wafsamba/samba_autoproto.py +++ b/buildtools/wafsamba/samba_autoproto.py @@ -8,6 +8,7 @@ def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'): bld.SET_BUILD_GROUP(group) if options is None: options='-q -P comment -o' + SET_TARGET_TYPE(bld, header, 'PROTOTYPE') t = bld(rule='${PERL} ../heimdal/cf/make-proto.pl ${OPTIONS} ${TGT[0].abspath(env)} ${SRC}', source=source, target=header, @@ -27,6 +28,7 @@ Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE def SAMBA_AUTOPROTO(bld, header, source): '''rule for samba prototype generation''' bld.SET_BUILD_GROUP('prototypes') + SET_TARGET_TYPE(bld, header, 'PROTOTYPE') bld( source = source, target = header, diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index dc91336c90..63d657f370 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -681,6 +681,16 @@ Task.TaskBase.classes['cc_link'].display = link_display def samba_display(self): if Options.options.progress_bar != 0: return Task.Task.old_display(self) + + targets = LOCAL_CACHE(self, 'TARGET_TYPE') + if self.name in targets: + target_type = targets[self.name] + type_map = { 'GENERATOR' : 'Generating', + 'PROTOTYPE' : 'Generating' + } + if target_type in type_map: + return progress_display(self, type_map[target_type], self.name) + fname = self.inputs[0].bldpath(self.env) if fname[0:3] == '../': fname = fname[3:] |