svn commit: samba r10446 - in branches/SAMBA_4_0/source/librpc: .

tpot at samba.org tpot at samba.org
Fri Sep 23 07:42:19 GMT 2005


Author: tpot
Date: 2005-09-23 07:42:17 +0000 (Fri, 23 Sep 2005)
New Revision: 10446

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10446

Log:
Add ndr_base and rpc_base sources to proto.h

Generate NDR mashalling code for all idl files (why isn't this automatically by the scanner when it finds librpc/gen_ndr/{misc,dcerpc,orpc}.h in includes.h?)

Modified:
   branches/SAMBA_4_0/source/librpc/SConscript


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/SConscript
===================================================================
--- branches/SAMBA_4_0/source/librpc/SConscript	2005-09-23 07:40:15 UTC (rev 10445)
+++ branches/SAMBA_4_0/source/librpc/SConscript	2005-09-23 07:42:17 UTC (rev 10446)
@@ -1,19 +1,25 @@
-Import('hostenv')
-hostenv.StaticLibrary('ndr_base', 
-		['ndr/ndr.c','ndr/ndr_basic.c','ndr/ndr_string.c','ndr/ndr_obfuscate.c',
-		'ndr/ndr_misc.c'])
+Import('hostenv', 'proto_files')
 
+ndr_base_files = ['ndr/ndr.c', 'ndr/ndr_basic.c', 'ndr/ndr_string.c',
+		  'ndr/ndr_obfuscate.c', 'ndr/ndr_misc.c'] 
+
+hostenv.StaticLibrary('ndr_base', ndr_base_files)
+proto_files += [File(x) for x in ndr_base_files]
+
 hostenv.StaticLibrary('ndr_compression',
 		['ndr/ndr_compression.c'])
 
-hostenv.StaticLibrary('rpc_base', 
-		[ 'rpc/dcerpc.c','rpc/dcerpc_auth.c','rpc/dcerpc_schannel.c',
-		'rpc/dcerpc_util.c','rpc/dcerpc_error.c','rpc/dcerpc_smb.c',
-		'rpc/dcerpc_sock.c'])
+rpc_base_files = ['rpc/dcerpc.c', 'rpc/dcerpc_auth.c', 'rpc/dcerpc_schannel.c',
+		  'rpc/dcerpc_util.c', 'rpc/dcerpc_error.c',
+		  'rpc/dcerpc_smb.c', 'rpc/dcerpc_sock.c'] 
 
-ndr_misc = hostenv.NdrMarshaller('idl/misc.idl')
-hostenv.StaticLibrary('ndr_misc', ndr_misc)
+hostenv.StaticLibrary('rpc_base', rpc_base_files)
+proto_files += [File(x) for x in rpc_base_files]
 
+from glob import glob
+for idl in glob('idl/*.idl'):
+	hostenv.NdrMarshaller(idl)
+
 '''
 [SUBSYSTEM::NDR_AUDIOSRV]
 INIT_FUNCTION = dcerpc_audiosrv_init



More information about the samba-cvs mailing list