diff options
| -rw-r--r-- | buildtools/wafsamba/samba_errtable.py | 27 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_build | 44 |
2 files changed, 35 insertions, 36 deletions
diff --git a/buildtools/wafsamba/samba_errtable.py b/buildtools/wafsamba/samba_errtable.py deleted file mode 100644 index 78480221b6..0000000000 --- a/buildtools/wafsamba/samba_errtable.py +++ /dev/null @@ -1,27 +0,0 @@ -# waf build tool for building .et files with compile_et -import Build -from samba_utils import * - -def SAMBA_ERRTABLE(bld, name, source): - '''Build a heimdal errtable from a .et file''' - - bname = source[0:-3]; # strip off the .et suffix - - if not SET_TARGET_TYPE(bld, name, 'ET'): - return - - bld.SET_BUILD_GROUP('build_source') - - out_files = [] - out_files.append('%s.c' % bname) - out_files.append('%s.h' % bname) - - t = bld(rule='${SRC[1].abspath(env)} . ${TGT[0].parent.abspath(env)} default/source4/heimdal_build/compile_et ${SRC[0].abspath(env)} ${TGT[0].bldpath(env)}', - ext_out = '.c', - before = 'cc', - on_results = True, - shell = True, - source = [source, 'et_compile_wrapper.sh', 'compile_et'], - target = out_files, - name = name) -Build.BuildContext.SAMBA_ERRTABLE = SAMBA_ERRTABLE diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index 39438875bc..5254b3be3e 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -4,6 +4,32 @@ import Build import os from samba_utils import SET_TARGET_TYPE +# waf build tool for building .et files with compile_et + +def HEIMDAL_ERRTABLE(bld, name, source): + '''Build a heimdal errtable from a .et file''' + + bname = source[0:-3]; # strip off the .et suffix + + if not SET_TARGET_TYPE(bld, name, 'ET'): + return + + bld.SET_BUILD_GROUP('build_source') + + out_files = [] + out_files.append('%s.c' % bname) + out_files.append('%s.h' % bname) + + t = bld(rule='${SRC[1].abspath(env)} . ${TGT[0].parent.abspath(env)} default/source4/heimdal_build/compile_et ${SRC[0].abspath(env)} ${TGT[0].bldpath(env)}', + ext_out = '.c', + before = 'cc', + on_results = True, + shell = True, + source = [source, 'et_compile_wrapper.sh', 'compile_et'], + target = out_files, + name = name) +Build.BuildContext.HEIMDAL_ERRTABLE = HEIMDAL_ERRTABLE + def HEIMDAL_AUTOPROTO(bld, header, source, options=None, group='prototypes'): '''rule for heimdal prototype generation''' bld.SET_BUILD_GROUP(group) @@ -175,39 +201,39 @@ bld.SAMBA_ASN1('HEIMDAL_HDB_ASN1', '../heimdal/lib/hdb/hdb.asn1', includes='../heimdal/lib/asn1') -bld.SAMBA_ERRTABLE('HEIMDAL_ASN1_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_ASN1_ERR_ET', '../heimdal/lib/asn1/asn1_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_HDB_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_HDB_ERR_ET', '../heimdal/lib/hdb/hdb_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_HEIM_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_HEIM_ERR_ET', '../heimdal/lib/krb5/heim_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_K524_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_K524_ERR_ET', '../heimdal/lib/krb5/k524_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_KRB_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_KRB_ERR_ET', '../heimdal/lib/krb5/krb_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_KRB5_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_KRB5_ERR_ET', '../heimdal/lib/krb5/krb5_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_GKRB5_ERR_ET', '../heimdal/lib/gssapi/krb5/gkrb5_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_HX509_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_HX509_ERR_ET', '../heimdal/lib/hx509/hx509_err.et') -bld.SAMBA_ERRTABLE('HEIMDAL_WIND_ERR_ET', +bld.HEIMDAL_ERRTABLE('HEIMDAL_WIND_ERR_ET', '../heimdal/lib/wind/wind_err.et') HEIMDAL_ROKEN_HOSTCC_SOURCE = ''' |