librpc/idl: avoid compiling unused .idl source

Improve build time by only compiling .idl sources which are actually
used.

Signed-off-by: David Disseldorp <ddiss@samba.org>

diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index a71f6e355ffe2b1bc5c935a86134f2cc73b07d06..1496de86625282c7175ebec72929f5ca150dbccf 100644 (file)
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -1,20 +1,60 @@
 #!/usr/bin/env python
 
 bld.SAMBA_PIDL_LIST('PIDL',
-                    '''atsvc.idl auth.idl drsuapi.idl epmapper.idl initshutdown.idl
-                       ntlmssp.idl negoex.idl schannel.idl
-                       dfsblobs.idl eventlog.idl file_id.idl keysvc.idl
-                       msgsvc.idl ntsvcs.idl remact.idl security.idl smb_acl.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
-                       dbgidl.idl dnsserver.idl echo.idl frsrpc.idl lsa.idl nbt.idl dns.idl
-                       oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
-                       drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
-                       notify.idl
-                       smb2_lease_struct.idl
-                       policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
-                       fsrvp.idl bkupblobs.idl fscc.idl frsblobs.idl witness.idl clusapi.idl
-                       mdssvc.idl winspool.idl''',
+                    '''
+                    atsvc.idl
+                    auth.idl
+                    drsuapi.idl
+                    epmapper.idl
+                    initshutdown.idl
+                    ntlmssp.idl
+                    negoex.idl
+                    schannel.idl
+                    dfsblobs.idl
+                    eventlog.idl
+                    file_id.idl
+                    ntsvcs.idl
+                    remact.idl
+                    security.idl
+                    smb_acl.idl
+                    unixinfo.idl
+                    browser.idl
+                    server_id.idl
+                    dfs.idl
+                    dssetup.idl
+                    frsapi.idl
+                    krb5pac.idl
+                    named_pipe_auth.idl
+                    orpc.idl
+                    spoolss.idl
+                    xattr.idl
+                    dnsserver.idl
+                    echo.idl
+                    frsrpc.idl
+                    lsa.idl
+                    nbt.idl
+                    dns.idl
+                    oxidresolver.idl
+                    samr.idl
+                    srvsvc.idl
+                    winreg.idl
+                    dcerpc.idl
+                    drsblobs.idl
+                    mgmt.idl
+                    netlogon.idl
+                    notify.idl
+                    smb2_lease_struct.idl
+                    svcctl.idl
+                    wkssvc.idl
+                    eventlog6.idl
+                    backupkey.idl
+                    fsrvp.idl
+                    bkupblobs.idl
+                    fscc.idl
+                    witness.idl
+                    clusapi.idl
+                    winspool.idl
+                    ''',
                     options='--header --ndr-parser --samba3-ndr-server --server --client --python',
                     output_dir='../gen_ndr')
 
@@ -51,3 +91,19 @@ bld.SAMBA_PIDL_LIST('PIDL',
                     'winbind.idl',
                     options='--header --ndr-parser --samba3-ndr-server --client --python',
                     output_dir='../gen_ndr')
+
+# The following IDLs are currently unused. Avoid pidl compilation to save time.
+unused = '''
+         frsblobs.idl
+         keysvc.idl
+         msgsvc.idl
+         wzcsvc.idl
+         rot.idl
+         w32time.idl
+         dbgidl.idl
+         efs.idl
+         frstrans.idl
+         policyagent.idl
+         scerpc.idl
+         mdssvc.idl
+         '''

diff --git a/librpc/wscript_build b/librpc/wscript_build
index e8cd49c9b4ae80b6eb09050f7e2afe426d03444b..0f604b665127d0239699bf6543037b3d9717897b 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -40,16 +40,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINREG',
     public_deps='ndr NDR_SECURITY NDR_LSA'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_EFS',
-    source='gen_ndr/ndr_efs.c',
-    public_deps='ndr NDR_SECURITY'
-    )
-
-bld.SAMBA_SUBSYSTEM('NDR_ROT',
-    source='gen_ndr/ndr_rot.c',
-    public_deps='ndr NDR_ORPC'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
     source='ndr/ndr_frsrpc.c gen_ndr/ndr_frsrpc.c',
     public_deps='ndr'
@@ -65,11 +55,6 @@ bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
     public_deps='ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
-    source='gen_ndr/ndr_frstrans.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
     source='gen_ndr/ndr_dfsblobs.c',
     public_deps='ndr'
@@ -85,16 +70,6 @@ bld.SAMBA_SUBSYSTEM('NDR_FSCC',
        public_deps='ndr'
        )
 
-bld.SAMBA_SUBSYSTEM('NDR_FRSBLOBS',
-       source='gen_ndr/ndr_frsblobs.c',
-       public_deps='ndr'
-       )
-
-bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
-    source='gen_ndr/ndr_policyagent.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
     source='gen_ndr/ndr_unixinfo.c',
     public_deps='ndr NDR_SECURITY'
@@ -125,21 +100,11 @@ bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
     public_deps='ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
-    source='gen_ndr/ndr_dbgidl.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
     source='gen_ndr/ndr_dssetup.c',
     public_deps='ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
-    source='gen_ndr/ndr_msgsvc.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_MGMT',
     source='gen_ndr/ndr_mgmt.c',
     public_deps='ndr'
@@ -170,26 +135,11 @@ bld.SAMBA_SUBSYSTEM('NDR_WMI',
     public_deps='ndr NDR_SECURITY NDR_DCOM'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
-    source='gen_ndr/ndr_wzcsvc.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
     source='gen_ndr/ndr_browser.c',
     public_deps='ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
-    source='gen_ndr/ndr_w32time.c',
-    public_deps='ndr'
-    )
-
-bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
-    source='gen_ndr/ndr_scerpc.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
     source='gen_ndr/ndr_server_id.c',
     deps='ndr',
@@ -197,11 +147,6 @@ bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID',
     header_path='gen_ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
-    source='gen_ndr/ndr_keysvc.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_RAP',
     source='gen_ndr/ndr_rap.c ndr/ndr_rap.c',
     public_deps='ndr'
@@ -325,11 +270,6 @@ bld.SAMBA_SUBSYSTEM('NDR_CLUSAPI',
     public_deps='ndr'
     )
 
-bld.SAMBA_SUBSYSTEM('NDR_MDSSVC',
-    source='gen_ndr/ndr_mdssvc.c',
-    public_deps='ndr'
-    )
-
 bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
     source='gen_ndr/ndr_dcerpc.c ndr/ndr_dcerpc.c',
     public_deps='ndr',
@@ -440,11 +380,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SMB_ACL',
     public_deps='NDR_SMB_ACL dcerpc-binding'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
-    source='gen_ndr/ndr_rot_c.c',
-    public_deps='NDR_ROT dcerpc-binding'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_ATSVC',
     source='gen_ndr/ndr_atsvc_c.c',
     public_deps='dcerpc-binding NDR_ATSVC'
@@ -455,11 +390,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
     public_deps='dcerpc-binding NDR_ECHO'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
-    source='gen_ndr/ndr_efs_c.c',
-    public_deps='dcerpc-binding NDR_EFS'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
     source='gen_ndr/ndr_lsa_c.c',
     public_deps='dcerpc-binding ndr-standard'
@@ -490,11 +420,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
     public_deps='dcerpc-binding NDR_DRSBLOBS'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
-    source='gen_ndr/ndr_policyagent_c.c',
-    public_deps='dcerpc-binding NDR_POLICYAGENT'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
     source='gen_ndr/ndr_unixinfo_c.c',
     public_deps='dcerpc-binding NDR_UNIXINFO'
@@ -547,21 +472,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
     public_deps='tevent NDR_EPMAPPER'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
-    source='gen_ndr/ndr_dbgidl_c.c',
-    public_deps='dcerpc-binding NDR_DBGIDL'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
     source='gen_ndr/ndr_dssetup_c.c',
     public_deps='dcerpc-binding NDR_DSSETUP'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
-    source='gen_ndr/ndr_msgsvc_c.c',
-    public_deps='dcerpc-binding NDR_MSGSVC'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
     source='gen_ndr/ndr_winreg_c.c',
     public_deps='dcerpc-binding ndr-standard'
@@ -587,21 +502,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
     public_deps='dcerpc-binding NDR_REMACT'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
-    source='gen_ndr/ndr_wzcsvc_c.c',
-    public_deps='dcerpc-binding NDR_WZCSVC'
-    )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
-    source='gen_ndr/ndr_w32time_c.c',
-    public_deps='dcerpc-binding NDR_W32TIME'
-    )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
-    source='gen_ndr/ndr_scerpc_c.c',
-    public_deps='dcerpc-binding NDR_SCERPC'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SERVER_ID',
     source='gen_ndr/ndr_server_id_c.c',
     public_deps='dcerpc-binding NDR_SERVER_ID'
@@ -617,11 +517,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
     public_deps='ndr-standard tevent'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
-    source='gen_ndr/ndr_keysvc_c.c',
-    public_deps='dcerpc-binding NDR_KEYSVC'
-    )
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_BACKUPKEY',
     source='gen_ndr/ndr_backupkey_c.c',
     public_deps='dcerpc-binding NDR_BACKUPKEY'
@@ -652,17 +547,12 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_CLUSAPI',
     public_deps='dcerpc-binding NDR_CLUSAPI'
     )
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MDSSVC',
-    source='gen_ndr/ndr_mdssvc_c.c',
-    public_deps='dcerpc-binding NDR_MDSSVC'
-    )
-
 # a grouping library for NDR subsystems that may be used by more than one target
 bld.SAMBA_LIBRARY('ndr-samba',
     source=[],
     deps='''NDR_DRSBLOBS NDR_DRSUAPI NDR_IDMAP NDR_NTLMSSP NDR_NEGOEX NDR_SCHANNEL NDR_MGMT
     NDR_DNSSERVER NDR_EPMAPPER NDR_XATTR NDR_UNIXINFO NDR_NAMED_PIPE_AUTH NDR_DCOM
-    NDR_NTPRINTING NDR_FSRVP NDR_WITNESS NDR_MDSSVC NDR_OPEN_FILES NDR_SMBXSRV''',
+    NDR_NTPRINTING NDR_FSRVP NDR_WITNESS NDR_OPEN_FILES NDR_SMBXSRV''',
     private_library=True,
     grouping_library=True
     )

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index f0c74818e3aee7cafd79123d87f9ed91c3c4c44f..d1e9b536a22e57b592f678a9e29cc3c92e3302ad 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -71,28 +71,19 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
        source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c',
         public_deps='''
                     ndr-standard
-                    NDR_EFS
                     NDR_DRSUAPI
-                    NDR_POLICYAGENT
                     NDR_UNIXINFO
                     NDR_SPOOLSS
                     NDR_EPMAPPER
-                    NDR_DBGIDL
                     NDR_DSSETUP
-                    NDR_MSGSVC
                     NDR_WINSIF
                     NDR_MGMT
                     NDR_OXIDRESOLVER
                     NDR_REMACT
-                    NDR_WZCSVC
                     NDR_BROWSER
-                    NDR_W32TIME
-                    NDR_SCERPC
-                    NDR_KEYSVC
                     ndr-krb5pac
                     NDR_XATTR
                     NDR_SCHANNEL
-                    NDR_ROT
                     NDR_DRSBLOBS
                     ndr_nbt
                     NDR_WINSREPL
@@ -106,7 +97,6 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
                     NDR_WINBIND
                     NDR_FRSRPC
                     NDR_FRSAPI
-                    NDR_FRSTRANS
                     NDR_NFS4ACL
                     NDR_NTP_SIGND
                     NDR_DCOM
@@ -121,7 +111,6 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
                     NDR_PREG
                     NDR_BKUPBLOBS
                     NDR_FSCC
-                    NDR_FRSBLOBS
                     NDR_CLUSAPI
                     NDR_WINSPOOL
                     NDR_CAB

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 72d3d292074bf9f4f3d03ab0bbaeac2631e47a6e..9780aafee02598f2dbc424d0f776ef183ac84848 100755 (executable)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -156,7 +156,6 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_SPOOLSS
                       RPC_NDR_SRVSVC
                       RPC_NDR_WKSSVC
-                      RPC_NDR_ROT
                       RPC_NDR_DSSETUP
                       RPC_NDR_REMACT
                       RPC_NDR_OXIDRESOLVER