The branch, master has been updated
via 9e2f394 s4-ldb: fixed the build with a space in the ldb modules
directory name
via 69c6e97 heimdal: fixed the waf build with a space in the directory
name
via a3ed70f pidl: fixed call to cpp with a space in the directory name
via fcdbd06 waf: fixed the build with a space in the source directory
via 808edd0 s4-rpc: make rpc connect less verbose
from e8bae4c waf:lib/util - add missing dependency on talloc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9e2f39484c9b61d115d54dfc81d102d3eab0b586
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Nov 21 23:05:59 2010 +1100
s4-ldb: fixed the build with a space in the ldb modules directory name
Autobuild-User: Andrew Tridgell <tri...@samba.org>
Autobuild-Date: Sun Nov 21 13:57:14 CET 2010 on sn-devel-104
commit 69c6e971a244e0837ed95537c9e4ea53e67b8b75
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Nov 21 23:05:37 2010 +1100
heimdal: fixed the waf build with a space in the directory name
commit a3ed70ff96122531ba000123cdf3992d26663f30
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Nov 21 23:05:07 2010 +1100
pidl: fixed call to cpp with a space in the directory name
commit fcdbd0613631b02b991214b2dccbb97eb571ac28
Author: Andrew Tridgell <tri...@samba.org>
Date: Sun Nov 21 23:04:43 2010 +1100
waf: fixed the build with a space in the source directory
commit 808edd02936879862df685775a12b1efba5947ea
Author: Andrew Tridgell <tri...@samba.org>
Date: Sat Nov 20 17:57:54 2010 +1100
s4-rpc: make rpc connect less verbose
-----------------------------------------------------------------------
Summary of changes:
buildtools/scripts/abi_gen.sh | 4 +-
buildtools/wafsamba/samba_autoconf.py | 5 ++-
buildtools/wafsamba/samba_autoproto.py | 2 +-
buildtools/wafsamba/samba_pidl.py | 2 +-
buildtools/wafsamba/wafsamba.py | 2 +-
pidl/idl.yp | 2 +-
pidl/lib/Parse/Pidl/IDL.pm | 2 +-
source4/heimdal_build/et_compile_wrapper.sh | 32 +++++++++++++-------------
source4/heimdal_build/wscript_build | 20 ++++++++--------
source4/lib/ldb/wscript | 2 +-
source4/librpc/rpc/dcerpc_connect.c | 2 +-
11 files changed, 38 insertions(+), 37 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/scripts/abi_gen.sh b/buildtools/scripts/abi_gen.sh
index 7b4cb12..d563fb8 100755
--- a/buildtools/scripts/abi_gen.sh
+++ b/buildtools/scripts/abi_gen.sh
@@ -10,11 +10,11 @@ cat <<EOF
set height 0
set width 0
EOF
-nm $SHAREDLIB | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | cut -c3- |
sort | while read s; do
+nm "$SHAREDLIB" | cut -d' ' -f2- | egrep '^[BDGTRVWS]' | grep -v @ | cut -c3-
| sort | while read s; do
echo "echo $s: "
echo p $s
done
) > $GDBSCRIPT
-gdb -batch -x $GDBSCRIPT $SHAREDLIB < /dev/null
+gdb -batch -x $GDBSCRIPT "$SHAREDLIB" < /dev/null
rm -f $GDBSCRIPT
diff --git a/buildtools/wafsamba/samba_autoconf.py
b/buildtools/wafsamba/samba_autoconf.py
index e84a456..03031a7 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -356,8 +356,10 @@ def CHECK_CODE(conf, code, define,
if msg is None:
msg="Checking for %s" % define
+ cflags = TO_LIST(cflags)
+
if local_include:
- cflags += ' -I%s' % conf.curdir
+ cflags.append('-I%s' % conf.curdir)
if not link:
type='nolink'
@@ -368,7 +370,6 @@ def CHECK_CODE(conf, code, define,
(ccflags, ldflags) = library_flags(conf, uselib)
- cflags = TO_LIST(cflags)
cflags.extend(ccflags)
if on_target:
diff --git a/buildtools/wafsamba/samba_autoproto.py
b/buildtools/wafsamba/samba_autoproto.py
index bb6400c..2d8ea54 100644
--- a/buildtools/wafsamba/samba_autoproto.py
+++ b/buildtools/wafsamba/samba_autoproto.py
@@ -16,7 +16,7 @@ def SAMBA_AUTOPROTO(bld, header, source):
on_results=True,
ext_out='.c',
before ='cc',
- rule = '${PERL} ${SCRIPT}/mkproto.pl --srcdir=.. --builddir=.
--public=/dev/null --private=${TGT} ${SRC}'
+ rule = '${PERL} "${SCRIPT}/mkproto.pl" --srcdir=.. --builddir=.
--public=/dev/null --private="${TGT}" ${SRC}'
)
t.env.SCRIPT = os.path.join(bld.srcnode.abspath(), 'source4/script')
Build.BuildContext.SAMBA_AUTOPROTO = SAMBA_AUTOPROTO
diff --git a/buildtools/wafsamba/samba_pidl.py
b/buildtools/wafsamba/samba_pidl.py
index 521222d..902d4c6 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -58,7 +58,7 @@ def SAMBA_PIDL(bld, pname, source,
pidl_src_nodes = bld.pidl_files_cache
# the cd .. is needed because pidl currently is sensitive to the directory
it is run in
- t = bld(rule='cd .. && ${PERL} ${PIDL} --quiet ${OPTIONS} --outputdir
${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
+ t = bld(rule='cd .. && ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir
${OUTPUTDIR} -- "${SRC[0].abspath(env)}"',
ext_out = '.c',
before = 'cc',
on_results = True,
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index dc25145..5d13fa1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -566,7 +566,7 @@ def ENABLE_TIMESTAMP_DEPENDENCIES(conf):
-t = Task.simple_task_type('copy_script', 'rm -f ${LINK_TARGET} && ln -s
${SRC[0].abspath(env)} ${LINK_TARGET}',
+t = Task.simple_task_type('copy_script', 'rm -f "${LINK_TARGET}" && ln -s
"${SRC[0].abspath(env)}" ${LINK_TARGET}',
shell=True, color='PINK', ext_in='.bin')
t.quiet = True
diff --git a/pidl/idl.yp b/pidl/idl.yp
index b3d5ed1..30247f9 100644
--- a/pidl/idl.yp
+++ b/pidl/idl.yp
@@ -657,7 +657,7 @@ sub parse_file($$)
$cpp = "cpp";
}
my $includes = join('',map { " -I$_" } @$incdirs);
- my $data = `$cpp -D__PIDL__$includes -xc $filename`;
+ my $data = `$cpp -D__PIDL__$includes -xc "$filename"`;
$/ = $saved_delim;
return parse_string($data, $filename);
diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm
index bc66020..de605c7 100644
--- a/pidl/lib/Parse/Pidl/IDL.pm
+++ b/pidl/lib/Parse/Pidl/IDL.pm
@@ -2623,7 +2623,7 @@ sub parse_file($$)
$cpp = "cpp";
}
my $includes = join('',map { " -I$_" } @$incdirs);
- my $data = `$cpp -D__PIDL__$includes -xc $filename`;
+ my $data = `$cpp -D__PIDL__$includes -xc "$filename"`;
$/ = $saved_delim;
return parse_string($data, $filename);
diff --git a/source4/heimdal_build/et_compile_wrapper.sh
b/source4/heimdal_build/et_compile_wrapper.sh
index b267bb5..939b434 100755
--- a/source4/heimdal_build/et_compile_wrapper.sh
+++ b/source4/heimdal_build/et_compile_wrapper.sh
@@ -1,13 +1,13 @@
#!/bin/sh
#
-SELF=$0
-SELFDIR=`dirname ${SELF}`
+SELF="$0"
+SELFDIR=`dirname "${SELF}"`
-DESTDIR=$1
-CMD=$2
-FILE=$3
-SOURCE=$4
+DESTDIR="$1"
+CMD="$2"
+FILE="$3"
+SOURCE="$4"
shift 4
test -z "${DESTDIR}" && {
@@ -30,22 +30,22 @@ test -z "${SOURCE}" && {
exit 1;
}
-CURDIR=`pwd`
+CURDIR="`pwd`"
-cd ${DESTDIR} && {
+cd "${DESTDIR}" && {
# Remove older copies beforehand - MIT's compile_et uses odd
permissions for these
# files, which makes Heimdal's compile_et fail mysteriously when
writing to them.
- rm -f `basename ${FILE} .et`.c
- rm -f `basename ${FILE} .et`.h
- ${CMD} ${FILE} >&2 || exit 1;
- cd ${CURDIR}
+ rm -f `basename "${FILE}" .et`.c
+ rm -f `basename "${FILE}" .et`.h
+ "${CMD}" "${FILE}" >&2 || exit 1;
+ cd "${CURDIR}"
TMP="${SOURCE}.$$"
- mv ${SOURCE} ${TMP} && {
- echo "#include \"config.h\"" > ${SOURCE} && {
- cat ${TMP} >> ${SOURCE}
+ mv "${SOURCE}" "${TMP}" && {
+ echo "#include \"config.h\"" > "${SOURCE}" && {
+ cat "${TMP}" >> "${SOURCE}"
}
}
- rm -f ${TMP}
+ rm -f "${TMP}"
} || {
echo "${SELF}:cannot cd into '${DESTDIR}'" >&2;
exit 1;
diff --git a/source4/heimdal_build/wscript_build
b/source4/heimdal_build/wscript_build
index 3ce70a2..421ead4 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -52,8 +52,8 @@ def HEIMDAL_ASN1(name, source,
# SRC[0].abspath(env) gives the absolute path to the source directory for
the first
# source file. Note that in the case of a option_file, we have more than
# one source file
- cd_rule = 'cd ${TGT[0].parent.abspath(env)}'
- asn1_rule = cd_rule + ' && ${BLDBIN}/asn1_compile ${OPTION_FILE}
${ASN1OPTIONS} --one-code-file ${SRC[0].abspath(env)} ${ASN1NAME}'
+ cd_rule = 'cd "${TGT[0].parent.abspath(env)}"'
+ asn1_rule = cd_rule + ' && "${BLDBIN}/asn1_compile" ${OPTION_FILE}
${ASN1OPTIONS} --one-code-file "${SRC[0].abspath(env)}" ${ASN1NAME}'
source = to_list(source)
@@ -74,7 +74,7 @@ def HEIMDAL_ASN1(name, source,
t.env.ASN1OPTIONS = options
t.env.BLDBIN =
os.path.normpath(os.path.join(bld.srcnode.abspath(bld.env), '..'))
if option_file is not None:
- t.env.OPTION_FILE = "--option-file=%s" %
os.path.normpath(os.path.join(bld.curdir, option_file))
+ t.env.OPTION_FILE = "--option-file='%s'" %
os.path.normpath(os.path.join(bld.curdir, option_file))
cfile = out_files[0][0:-2] + '.c'
hfile = out_files[1][0:-3] + '.h'
@@ -148,7 +148,7 @@ def HEIMDAL_ERRTABLE(name, source):
if not bld.CONFIG_SET('USING_SYSTEM_COMPILE_ET'):
deps = 'compile_et'
- t = bld(rule='${SRC[1].abspath(env)} ${TGT[0].parent.abspath(env)}
${COMPILE_ET} ${SRC[0].abspath(env)} ${TGT[0].bldpath(env)}',
+ t = bld(rule='"${SRC[1].abspath(env)}" "${TGT[0].parent.abspath(env)}"
"${COMPILE_ET}" "${SRC[0].abspath(env)}" ${TGT[0].bldpath(env)}',
ext_out = '.c',
before = 'cc',
on_results = True,
@@ -166,7 +166,7 @@ def HEIMDAL_AUTOPROTO(header, source, options=None,
group='prototypes'):
options='-q -P comment -o'
SET_TARGET_TYPE(bld, header, 'PROTOTYPE')
source = heimdal_paths(source)
- t = bld(rule='${PERL} ${HEIMDAL}/cf/make-proto.pl ${OPTIONS}
${TGT[0].abspath(env)} ${SRC}',
+ t = bld(rule='${PERL} "${HEIMDAL}/cf/make-proto.pl" ${OPTIONS}
"${TGT[0].abspath(env)}" ${SRC}',
source=source,
target=header,
on_results=True,
@@ -780,7 +780,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR(
name="HEIMDAL_ERRORLIST",
- rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()}
${SRC[1].parent.abspath(env)}",
+ rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}'
'${SRC[1].parent.abspath(env)}'",
source = '../heimdal/lib/wind/gen-errorlist.py
../heimdal/lib/wind/rfc3454.txt ../heimdal/lib/wind/stringprep.py',
target = '../heimdal/lib/wind/errorlist_table.c
../heimdal/lib/wind/errorlist_table.h'
)
@@ -788,21 +788,21 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR(
name = 'HEIMDAL_NORMALIZE_TABLE',
- rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()}
${SRC[2].abspath()} ${SRC[1].parent.abspath(env)}",
+ rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}'
'${SRC[2].abspath()}' '${SRC[1].parent.abspath(env)}'",
source = '../heimdal/lib/wind/gen-normalize.py
../heimdal/lib/wind/UnicodeData.txt
../heimdal/lib/wind/CompositionExclusions-3.2.0.txt',
target = '../heimdal/lib/wind/normalize_table.h
../heimdal/lib/wind/normalize_table.c'
)
HEIMDAL_GENERATOR(
name = 'HEIMDAL_COMBINING_TABLE',
- rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()}
${SRC[1].parent.abspath(env)}",
+ rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}'
'${SRC[1].parent.abspath(env)}'",
source = '../heimdal/lib/wind/gen-combining.py
../heimdal/lib/wind/UnicodeData.txt',
target = '../heimdal/lib/wind/combining_table.h
../heimdal/lib/wind/combining_table.c'
)
HEIMDAL_GENERATOR(
name = 'HEIMDAL_BIDI_TABLE',
- rule="${PYTHON} ${SRC[0].abspath()} ${SRC[1].abspath()}
${SRC[1].parent.abspath(env)}",
+ rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[1].abspath()}'
'${SRC[1].parent.abspath(env)}'",
source = '../heimdal/lib/wind/gen-bidi.py
../heimdal/lib/wind/rfc3454.txt',
target = '../heimdal/lib/wind/bidi_table.h
../heimdal/lib/wind/bidi_table.c'
)
@@ -810,7 +810,7 @@ if not bld.CONFIG_SET('USING_SYSTEM_WIND'):
HEIMDAL_GENERATOR(
name = 'HEIMDAL_MAP_TABLE',
- rule="${PYTHON} ${SRC[0].abspath()} ${SRC[2].abspath()}
${SRC[2].parent.abspath(env)}",
+ rule="${PYTHON} '${SRC[0].abspath()}' '${SRC[2].abspath()}'
'${SRC[2].parent.abspath(env)}'",
source = '../heimdal/lib/wind/gen-map.py
../heimdal/lib/wind/stringprep.py ../heimdal/lib/wind/rfc3454.txt',
target = '../heimdal/lib/wind/map_table.h
../heimdal/lib/wind/map_table.c'
)
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 5c4054a..4e6fc34 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -206,7 +206,7 @@ def build(bld):
'common/ldb.c',
deps='tevent',
includes='include',
- cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir)
+ cflags=['-DLDB_MODULESDIR=\"%s\"' % modules_dir])
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
diff --git a/source4/librpc/rpc/dcerpc_connect.c
b/source4/librpc/rpc/dcerpc_connect.c
index 0f3a862..a1b3dee 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -516,7 +516,7 @@ static void continue_map_binding(struct composite_context
*ctx)
c->status = dcerpc_epm_map_binding_recv(ctx);
if (!composite_is_ok(c)) return;
- DEBUG(2,("Mapped to DCERPC endpoint %s\n", s->binding->endpoint));
+ DEBUG(4,("Mapped to DCERPC endpoint %s\n", s->binding->endpoint));
continue_connect(c, s);
}
--
Samba Shared Repository
