sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

build: teach samba_pild.py about the --com-header and --dcom-proxy options

Browse Source
This commit is contained in:
Andrew Tridgell 2010-03-17 22:17:15 +11:00
parent 365f29136f
commit b7cc6d48d5
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
buildtools/wafsamba/samba_pidl.py
View File

@ -29,6 +29,8 @@ def SAMBA_PIDL(bld, pname, source,
'--client' : 'ndr_%s_c.c ndr_%s_c.h', '--client' : 'ndr_%s_c.c ndr_%s_c.h',
'--python' : 'py_%s.c', '--python' : 'py_%s.c',
'--tdr-parser' : 'tdr_%s.c tdr_%s.h', '--tdr-parser' : 'tdr_%s.c tdr_%s.h',
'--dcom-proxy' : '%s_p.c',
'--com-header' : 'com_%s.h'
} }
table_header_idx = None table_header_idx = None
@ -53,12 +55,13 @@ def SAMBA_PIDL(bld, pname, source,
# the cd .. is needed because pidl currently is sensitive to the directory it is run in # the cd .. is needed because pidl currently is sensitive to the directory it is run in
t = bld(rule='cd .. && ${PIDL} ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}', t = bld(rule='cd .. && ${PIDL} ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
ext_out = '.c', ext_out = '.c',
before = 'cc', before = 'cc',
shell = True, shell = True,
source = source, source = source,
target = out_files, target = out_files,
name = name) name = name,
samba_type = 'PIDL')
# prime the list of nodes we are dependent on with the cached pidl sources # prime the list of nodes we are dependent on with the cached pidl sources
t.allnodes = pidl_src_nodes t.allnodes = pidl_src_nodes

10
librpc/idl/wscript_build
View File

@ -6,9 +6,9 @@
# object files) in ../gen_ndr in the source tree, but still allow waf to be # object files) in ../gen_ndr in the source tree, but still allow waf to be
# happy about all the build files appearing in the expected location in bin/default # happy about all the build files appearing in the expected location in bin/default
bld.SAMBA_PIDL_LIST('PIDL', bld.SAMBA_PIDL_LIST('PIDL',
'''atsvc.idl dcom.idl drsuapi.idl epmapper.idl initshutdown.idl '''atsvc.idl drsuapi.idl epmapper.idl initshutdown.idl
misc.idl ntlmssp.idl protected_storage.idl schannel.idl trkwks.idl misc.idl ntlmssp.idl protected_storage.idl schannel.idl trkwks.idl
wmi.idl audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl keysvc.idl audiosrv.idl dfsblobs.idl dsbackup.idl eventlog.idl keysvc.idl
msgsvc.idl ntsvcs.idl remact.idl security.idl unixinfo.idl wzcsvc.idl msgsvc.idl ntsvcs.idl remact.idl security.idl unixinfo.idl wzcsvc.idl
browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.idl
named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl named_pipe_auth.idl orpc.idl rot.idl spoolss.idl w32time.idl xattr.idl
@ -16,6 +16,12 @@ bld.SAMBA_PIDL_LIST('PIDL',
oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl oxidresolver.idl samr.idl srvsvc.idl winreg.idl dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''', policyagent.idl scerpc.idl svcctl.idl wkssvc.idl''',
options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python',
output_dir='../gen_ndr',
symlink=True)
bld.SAMBA_PIDL_LIST('PIDL',
'wmi.idl dcom.idl',
options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header', options='--header --ndr-parser --samba3-ndr-server --samba3-ndr-client --server --client --python --dcom-proxy --com-header',
output_dir='../gen_ndr', output_dir='../gen_ndr',
symlink=True) symlink=True)

2
source4/lib/com/wscript_build
View File

@ -1,6 +1,6 @@
bld.SAMBA_SUBSYSTEM('COM', bld.SAMBA_SUBSYSTEM('COM',
source='tables.c rot.c main.c', source='tables.c rot.c main.c',
deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR' deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR PIDL_DCOM'
) )