The branch, master has been updated
via a578ac0 s3-waf: add slightly different mkbuildoptions awk script
for waf.
via e481b66 s3-waf: use more of the NDR_ subsystems.
from 4618e25 Fix bug 7704 - Possible error in fix to
rpc_server/srv_spoolss_nt.c.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a578ac028fa92bbe866f1a7d7f845d926281cf40
Author: Günther Deschner <[email protected]>
Date: Tue Oct 5 18:08:51 2010 +0200
s3-waf: add slightly different mkbuildoptions awk script for waf.
This allows to run make test (w/o smbtorture4 for now) using waf.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Tue Oct 5 18:24:55 UTC 2010 on sn-devel-104
commit e481b6637436ff3a145e7104811911c501bf9e42
Author: Günther Deschner <[email protected]>
Date: Tue Oct 5 17:01:14 2010 +0200
s3-waf: use more of the NDR_ subsystems.
Guenther
-----------------------------------------------------------------------
Summary of changes:
.../{mkbuildoptions.awk => mkbuildoptions-waf.awk} | 33 +++++++++----------
source3/wscript_build | 17 +++++-----
2 files changed, 24 insertions(+), 26 deletions(-)
copy source3/script/{mkbuildoptions.awk => mkbuildoptions-waf.awk} (97%)
Changeset truncated at 500 lines:
diff --git a/source3/script/mkbuildoptions.awk
b/source3/script/mkbuildoptions-waf.awk
similarity index 97%
copy from source3/script/mkbuildoptions.awk
copy to source3/script/mkbuildoptions-waf.awk
index 1955a80..ddb3f65 100644
--- a/source3/script/mkbuildoptions.awk
+++ b/source3/script/mkbuildoptions-waf.awk
@@ -70,7 +70,7 @@ BEGIN {
print " output(screen,\" SRCDIR:
%s\\n\",BUILD_ENV_SRCDIR);";
print " output(screen,\" BUILDDIR:
%s\\n\",BUILD_ENV_BUILDDIR);";
print "";
- print " ";
+ print " ";
print "#endif";
print "";
@@ -125,14 +125,14 @@ BEGIN {
# end capture multi-line comments
/(.*?)\*\// {
- last_comment = last_comment $0;
+ last_comment = last_comment $0;
in_comment = 0;
next;
}
# capture middle lines of multi-line comments
in_comment {
- last_comment = last_comment $0;
+ last_comment = last_comment $0;
next;
}
@@ -145,7 +145,7 @@ in_comment {
##################################################
# if we have an #undef and a last_comment, store it
-/^\#undef/ {
+/^\#define/ {
split($0,a);
comments_ary[a[2]] = last_comment;
last_comment = "";
@@ -155,33 +155,33 @@ in_comment {
# for each line, sort into appropriate section
# then move on
-/^\#undef WITH/ {
+/^\#define WITH/ {
with_ary[with_i++] = a[2];
# we want (I think) to allow --with to show up in more than one place,
so no next
}
-/^\#undef HAVE_UT_UT_/ || /^\#undef .*UTMP/ {
+/^\#define HAVE_UT_UT_/ || /^\#define .*UTMP/ {
utmp_ary[utmp_i++] = a[2];
next;
}
-/^\#undef HAVE_SYS_.*?_H$/ {
+/^\#define HAVE_SYS_.*?_H$/ {
sys_ary[sys_i++] = a[2];
next;
}
-/^\#undef HAVE_.*?_H$/ {
+/^\#define HAVE_.*?_H$/ {
headers_ary[headers_i++] = a[2];
next;
}
-/^\#undef HAVE_/ {
+/^\#define HAVE_/ {
have_ary[have_i++] = a[2];
next;
}
-/^\#undef/ {
+/^\#define/ {
misc_ary[misc_i++] = a[2];
next;
}
@@ -198,7 +198,7 @@ function sort(ARRAY, ELEMENTS) {
}
}
return;
-}
+}
##################################################
@@ -206,13 +206,13 @@ function sort(ARRAY, ELEMENTS) {
# expects: ARRAY an array of things defined
# ELEMENTS number of elements in ARRAY
# TITLE title for section
-# returns: nothing
+# returns: nothing
function output(ARRAY, ELEMENTS, TITLE) {
-
+
# add section header
print "\n\t/* Show " TITLE " */";
print "\toutput(screen, \"\\n " TITLE ":\\n\");\n";
-
+
# sort element using bubble sort (slow, but easy)
sort(ARRAY, ELEMENTS);
@@ -220,9 +220,9 @@ function output(ARRAY, ELEMENTS, TITLE) {
# loop through array of defines, outputting code
for (i = 0; i < ELEMENTS; i++) {
print "#ifdef " ARRAY[i];
-
+
# I don't know which one to use....
-
+
print "\toutput(screen, \" " ARRAY[i] "\\n\");";
#printf "\toutput(screen, \" %s\\n %s\\n\\n\");\n",
comments_ary[ARRAY[i]], ARRAY[i];
#printf "\toutput(screen, \" %-35s %s\\n\");\n", ARRAY[i],
comments_ary[ARRAY[i]];
@@ -271,4 +271,3 @@ END {
print "}";
}
-
diff --git a/source3/wscript_build b/source3/wscript_build
index b5f277a..5a6bab6 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -170,7 +170,7 @@ LIBREPLACE_SRCS = ''
ZLIB_SRCS = ''
LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
- lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+ lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
lib/talloc_dict.c
@@ -238,14 +238,12 @@ LIBADS_SRC = '''libads/ldap.c
libads/disp_sec.c libads/ldap_utils.c
libads/ldap_schema.c libads/util.c libads/ndr.c'''
-LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
- ../librpc/ndr/ndr_krb5pac.c
- ../librpc/gen_ndr/ndr_krb5pac.c'''
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
- passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+ passdb/machine_sid.c'''
LIBNBT_SRC = '''../libcli/nbt/nbtname.c
../libcli/netlogon.c
@@ -769,7 +767,6 @@ LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
lib/netapi/cm.c
- librpc/gen_ndr/ndr_libnetapi.c
lib/netapi/libnetapi.c
lib/netapi/joindomain.c
lib/netapi/serverinfo.c
@@ -955,7 +952,7 @@ SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
LIBS='ICONV'
bld.SAMBA_GENERATOR('build_options',
- source='include/config.h script/mkbuildoptions.awk',
+ source='include/config.h script/mkbuildoptions-waf.awk',
target='smbd/build_options.c',
rule='${AWK} -f ${SRC[1].abspath(env)} > ${TGT} <
${SRC[0].abspath(env)}')
@@ -1026,7 +1023,7 @@ bld.SAMBA_LIBRARY('libnetapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap libwbclient LIB_NONSMBD
LIBSMB KRBCLIENT
PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
- LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL''',
+ LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL
NDR_LIBNETAPI''',
public_headers='lib/netapi/netapi.h',
vars=locals())
@@ -1119,7 +1116,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY
CHARSET',
+ deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY
CHARSET NDR_MESSAGING',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1149,6 +1146,7 @@ bld.SAMBA_SUBSYSTEM('CLDAP',
bld.SAMBA_SUBSYSTEM('SECRETS',
source=SECRETS_SRC,
+ deps='NDR_SECRETS',
vars=locals())
bld.SAMBA_SUBSYSTEM('SMBLDAP',
@@ -1163,6 +1161,7 @@ bld.SAMBA_SUBSYSTEM('LIBADS',
bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
+ deps='NDR_KRB5PAC',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',
--
Samba Shared Repository
