diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-17 22:17:15 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:52 +1000 |
| commit | b7cc6d48d5664aa83951c31fbdaabfb839f1b420 (patch) | |
| tree | 68e8f7e91b74a463a16d2b86992b034a9af9856b | |
| parent | 365f29136fa0410ca92f17b4595cd5c51b38697c (diff) | |
| download | samba-b7cc6d48d5664aa83951c31fbdaabfb839f1b420.tar.gz samba-b7cc6d48d5664aa83951c31fbdaabfb839f1b420.tar.bz2 samba-b7cc6d48d5664aa83951c31fbdaabfb839f1b420.zip | |
build: teach samba_pild.py about the --com-header and --dcom-proxy options
| -rw-r--r-- | buildtools/wafsamba/samba_pidl.py | 15 | ||||
| -rw-r--r-- | librpc/idl/wscript_build | 10 | ||||
| -rw-r--r-- | source4/lib/com/wscript_build | 2 |
3 files changed, 18 insertions, 9 deletions
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py index b7839bc0ca..6e47686105 100644 --- a/buildtools/wafsamba/samba_pidl.py +++ b/buildtools/wafsamba/samba_pidl.py @@ -29,6 +29,8 @@ def SAMBA_PIDL(bld, pname, source, '--client' : 'ndr_%s_c.c ndr_%s_c.h', '--python' : 'py_%s.c', '--tdr-parser' : 'tdr_%s.c tdr_%s.h', + '--dcom-proxy' : '%s_p.c', + '--com-header' : 'com_%s.h' } 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 t = bld(rule='cd .. && ${PIDL} ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}', - ext_out = '.c', - before = 'cc', - shell = True, - source = source, - target = out_files, - name = name) + ext_out = '.c', + before = 'cc', + shell = True, + source = source, + target = out_files, + name = name, + samba_type = 'PIDL') # prime the list of nodes we are dependent on with the cached pidl sources t.allnodes = pidl_src_nodes diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build index 9937af1a5b..ab0971068b 100644 --- a/librpc/idl/wscript_build +++ b/librpc/idl/wscript_build @@ -6,9 +6,9 @@ # 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 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 - 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 browser.idl dfs.idl dssetup.idl frsapi.idl krb5pac.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 drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.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', output_dir='../gen_ndr', symlink=True) diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build index 60ab5378ec..d836904c16 100644 --- a/source4/lib/com/wscript_build +++ b/source4/lib/com/wscript_build @@ -1,6 +1,6 @@ bld.SAMBA_SUBSYSTEM('COM', source='tables.c rot.c main.c', - deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR' + deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR PIDL_DCOM' ) |