[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Mon Sep 20 23:25:48 MDT 2010


The branch, v3-6-test has been updated
       via  fd07404 s3-waf: Try to fix the idl build. (cherry picked from commit 1b022d1d3d613d2299350f9c8cea8cec4510d0b2)
       via  1ff9913 s3-waf: Create a variable for LIBNDR_NTPRINTING_SRC. (cherry picked from commit 5af3177dbd79c3fe494ae82509a37368c8caf204)
      from  bf41982 Revert "s4:RPC-SPOOLSS-NOTIFY: skip test_RFFPCNEx() for now, as the test is broken"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit fd0740438d29a0beaab5f5f3715b27717ad3c9ce
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Aug 16 21:30:26 2010 +0200

    s3-waf: Try to fix the idl build.
    (cherry picked from commit 1b022d1d3d613d2299350f9c8cea8cec4510d0b2)

commit 1ff9913903438f22175f27f0c4443a17ce8a4f28
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Aug 16 20:35:31 2010 +0200

    s3-waf: Create a variable for LIBNDR_NTPRINTING_SRC.
    (cherry picked from commit 5af3177dbd79c3fe494ae82509a37368c8caf204)

-----------------------------------------------------------------------

Summary of changes:
 source3/librpc/idl/wscript_build |    1 +
 source3/wscript_build            |   38 ++++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
index 1efcc30..92f2ebd 100644
--- a/source3/librpc/idl/wscript_build
+++ b/source3/librpc/idl/wscript_build
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 
 bld.SAMBA_PIDL_LIST('PIDL',
                     '''messaging.idl libnetapi.idl notify.idl
diff --git a/source3/wscript_build b/source3/wscript_build
index c2c20d2..112fdae 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -86,6 +86,9 @@ LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ../librpc/gen_ndr/ndr_ntsvcs.c
                  ${LIBNDR_SPOOLSS_SRC}'''
 
+LIBNDR_NTPRINTING_SRC = '''../librpc/gen_ndr/ndr_ntprinting.c
+                           ../librpc/ndr/ndr_ntprinting.c'''
+
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
@@ -290,22 +293,22 @@ LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
                    ../librpc/rpc/binding.c'''
 
 DCERPC_CLIENT_GEN_SRC = '''
-                librpc/gen_ndr/ndr_lsa_c.c
-                librpc/gen_ndr/ndr_dfs_c.c
-                librpc/gen_ndr/ndr_echo_c.c
-                librpc/gen_ndr/ndr_srvsvc_c.c
-                librpc/gen_ndr/ndr_svcctl_c.c
-                librpc/gen_ndr/ndr_winreg_c.c
-                librpc/gen_ndr/ndr_initshutdown_c.c
-                librpc/gen_ndr/ndr_eventlog_c.c
-                librpc/gen_ndr/ndr_wkssvc_c.c
-                librpc/gen_ndr/ndr_netlogon_c.c
-                librpc/gen_ndr/ndr_samr_c.c
-                librpc/gen_ndr/ndr_dssetup_c.c
-                librpc/gen_ndr/ndr_ntsvcs_c.c
-                librpc/gen_ndr/ndr_epmapper_c.c
-                librpc/gen_ndr/ndr_drsuapi_c.c
-                librpc/gen_ndr/ndr_spoolss_c.c'''
+                ../librpc/gen_ndr/ndr_lsa_c.c
+                ../librpc/gen_ndr/ndr_dfs_c.c
+                ../librpc/gen_ndr/ndr_echo_c.c
+                ../librpc/gen_ndr/ndr_srvsvc_c.c
+                ../librpc/gen_ndr/ndr_svcctl_c.c
+                ../librpc/gen_ndr/ndr_winreg_c.c
+                ../librpc/gen_ndr/ndr_initshutdown_c.c
+                ../librpc/gen_ndr/ndr_eventlog_c.c
+                ../librpc/gen_ndr/ndr_wkssvc_c.c
+                ../librpc/gen_ndr/ndr_netlogon_c.c
+                ../librpc/gen_ndr/ndr_samr_c.c
+                ../librpc/gen_ndr/ndr_dssetup_c.c
+                ../librpc/gen_ndr/ndr_ntsvcs_c.c
+                ../librpc/gen_ndr/ndr_epmapper_c.c
+                ../librpc/gen_ndr/ndr_drsuapi_c.c
+                ../librpc/gen_ndr/ndr_spoolss_c.c'''
 
 LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_dfs.c
@@ -776,8 +779,7 @@ PRINTBACKEND_SRC = '''printing/printing.c
                       printing/nt_printing_tdb.c
                       printing/nt_printing_migrate.c
                       printing/nt_printing_ads.c
-                      librpc/gen_ndr/ndr_ntprinting.c
-                      ../librpc/ndr/ndr_ntprinting.c
+                      ${LIBNDR_NTPRINTING_SRC}
                       ${PRINTBASE_SRC}'''
 
 SMBD_SRC = '''${SMBD_SRC_BASE} ${SMBD_SRC_MAIN}'''


-- 
Samba Shared Repository


More information about the samba-cvs mailing list