sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

Transition to waf 1.8: replaced on_results by update_outputs

Browse Source 
Reviewed-By: Jelmer Vernooij <jelmer@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Thomas Nagy
2015-03-07 15:31:18 +01:00
committed by Andrew Bartlett
parent 2ab6c10f84
commit 5771276be9
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildtools/wafsamba/samba_autoproto.py
View File

@ -13,7 +13,7 @@ def SAMBA_AUTOPROTO(bld, header, source):
name = name, name = name,
source = source, source = source,
target = header, target = header,
on_results=True, update_outputs=True,
ext_out='.c', ext_out='.c',
before ='cc', before ='cc',
rule = '${PERL} "${SCRIPT}/mkproto.pl" --srcdir=.. --builddir=. --public=/dev/null --private="${TGT}" ${SRC}' rule = '${PERL} "${SCRIPT}/mkproto.pl" --srcdir=.. --builddir=. --public=/dev/null --private="${TGT}" ${SRC}'

4
buildtools/wafsamba/samba_pidl.py
View File

@ -78,7 +78,7 @@ def SAMBA_PIDL(bld, pname, source,
t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc), t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc),
ext_out = '.c', ext_out = '.c',
before = 'cc', before = 'cc',
on_results = True, update_outputs = True,
shell = True, shell = True,
source = source, source = source,
target = out_files, target = out_files,
@ -135,7 +135,7 @@ def SAMBA_PIDL_TABLES(bld, name, target):
rule = '${PERL} ${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}', rule = '${PERL} ${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}',
ext_out = '.c', ext_out = '.c',
before = 'cc', before = 'cc',
on_results = True, update_outputs = True,
shell = True, shell = True,
source = '../../librpc/tables.pl', source = '../../librpc/tables.pl',
target = target, target = target,

2
buildtools/wafsamba/wafsamba.py
View File

@ -638,7 +638,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
source=bld.EXPAND_VARIABLES(source, vars=vars), source=bld.EXPAND_VARIABLES(source, vars=vars),
target=target, target=target,
shell=isinstance(rule, str), shell=isinstance(rule, str),
on_results=True, update_outputs=True,
before='cc', before='cc',
ext_out='.c', ext_out='.c',
samba_type='GENERATOR', samba_type='GENERATOR',

14
source4/heimdal_build/wscript_build
View File

@ -70,7 +70,7 @@ def HEIMDAL_ASN1(name, source,
t = bld(rule=asn1_rule, t = bld(rule=asn1_rule,
ext_out = '.x', ext_out = '.x',
before = 'cc', before = 'cc',
on_results = True, update_outputs = True,
shell = True, shell = True,
source = source, source = source,
target = out_files, target = out_files,
@ -92,7 +92,7 @@ def HEIMDAL_ASN1(name, source,
source = out_files[0], source = out_files[0],
target = cfile, target = cfile,
shell = True, shell = True,
on_results=True, update_outputs=True,
ext_out = '.c', ext_out = '.c',
ext_in = '.x', ext_in = '.x',
depends_on = name + '_ASN1', depends_on = name + '_ASN1',
@ -103,7 +103,7 @@ def HEIMDAL_ASN1(name, source,
source = out_files[1], source = out_files[1],
ext_out = '.c', ext_out = '.c',
ext_in = '.x', ext_in = '.x',
on_results=True, update_outputs=True,
target = hfile, target = hfile,
depends_on = name + '_ASN1', depends_on = name + '_ASN1',
name = name + '_H') name = name + '_H')
@ -113,7 +113,7 @@ def HEIMDAL_ASN1(name, source,
source = out_files[2], source = out_files[2],
ext_out = '.c', ext_out = '.c',
ext_in = '.x', ext_in = '.x',
on_results=True, update_outputs=True,
target = hpriv, target = hpriv,
depends_on = name + '_ASN1', depends_on = name + '_ASN1',
name = name + '_PRIV_H') name = name + '_PRIV_H')
@ -158,7 +158,7 @@ def HEIMDAL_ERRTABLE(name, source):
t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}" "${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}', t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}" "${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}',
ext_out = '.c', ext_out = '.c',
before = 'cc', before = 'cc',
on_results = True, update_outputs = True,
shell = True, shell = True,
source = sources, source = sources,
target = out_files, target = out_files,
@ -176,7 +176,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None, group='prototypes'):
t = bld(rule='${PERL} "${HEIMDAL}/cf/make-proto.pl" ${OPTIONS} "${TGT[0].abspath(env)}" ${SRC}', t = bld(rule='${PERL} "${HEIMDAL}/cf/make-proto.pl" ${OPTIONS} "${TGT[0].abspath(env)}" ${SRC}',
source=source, source=source,
target=header, target=header,
on_results=True, update_outputs=True,
ext_out='.c', ext_out='.c',
before='cc') before='cc')
t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal') t.env.HEIMDAL = os.path.join(bld.srcnode.abspath(), 'source4/heimdal')
@ -201,7 +201,7 @@ def HEIMDAL_GENERATOR(name, rule, source='', target='',
source=source, source=source,
target=target, target=target,
shell=isinstance(rule, str), shell=isinstance(rule, str),
on_results=True, update_outputs=True,
before='cc', before='cc',
ext_out='.c', ext_out='.c',
vars=[rule], vars=[rule],