[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Jun 16 10:26:02 MDT 2010
The branch, master has been updated
via 65ca3e4... pidl-waf: Avoid relying on MakeMaker when installing pidl manpages.
via bd8fcd8... s4: Fix build when there is a system-provided ldb.
from a6f1c11... s4-smbtorture: Remind myself we need to add a test for SMBsplretq in RAP-PRINTING.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 65ca3e4ee985689cdb038ae366f57d523cbeb964
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jun 16 18:25:04 2010 +0200
pidl-waf: Avoid relying on MakeMaker when installing pidl manpages.
commit bd8fcd869da5a99d9505ede6f5038f98b7951bb3
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Wed Jun 16 18:13:18 2010 +0200
s4: Fix build when there is a system-provided ldb.
-----------------------------------------------------------------------
Summary of changes:
pidl/wscript | 37 ++++++++++++++------------
source4/dsdb/samdb/ldb_modules/wscript_build | 2 +-
source4/nbt_server/wscript_build | 2 +-
source4/ntptr/wscript_build | 2 +-
source4/utils/net/wscript_build | 2 +-
5 files changed, 24 insertions(+), 21 deletions(-)
delete mode 100644 pidl/blib/man1/.dummy
delete mode 100644 pidl/blib/man3/.dummy
Changeset truncated at 500 lines:
diff --git a/pidl/blib/man1/.dummy b/pidl/blib/man1/.dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/pidl/blib/man3/.dummy b/pidl/blib/man3/.dummy
deleted file mode 100644
index e69de29..0000000
diff --git a/pidl/wscript b/pidl/wscript
index 3137ad0..0c3c415 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -27,25 +27,32 @@ def build(bld):
pidl_src = ['pidl']
pidl_src.extend(bld.path.ant_glob('lib/**/*.pm').split())
- pidl_manpages = '''blib/man1/pidl.${PERLMAN1EXT} blib/man3/Parse::Pidl::NDR.${PERLMAN3EXT}
- blib/man3/Parse::Pidl::Wireshark::Conformance.${PERLMAN3EXT}
- blib/man3/Parse::Pidl::Dump.${PERLMAN3EXT}
- blib/man3/Parse::Pidl::Util.${PERLMAN3EXT}
- blib/man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'''.split()
-
- pidl_manpages = bld.EXPAND_VARIABLES(pidl_manpages)
+ pidl_manpages = {
+ 'pidl': 'man1/pidl.${PERLMAN1EXT}',
+ 'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Wireshark/Conformance.pm': 'man3/Parse::Pidl::Wireshark::Conformance.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Dump.pm': 'man3/Parse::Pidl::Dump.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Util.pm': 'man3/Parse::Pidl::Util.${PERLMAN3EXT}',
+ 'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'
+ }
+
+ for k, v in pidl_manpages.iteritems():
+ pidl_manpages[k] = bld.EXPAND_VARIABLES(v)
# use perl to build the manpages
bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
blib_bld = os.path.join(bld.srcnode.abspath(bld.env), 'pidl/blib')
- link_command = 'rm -rf blib && ln -s %s' % blib_bld
-
- t = bld.SAMBA_GENERATOR('pidl_manpages',
- source=pidl_src, target=pidl_manpages,
- rule='cd ${pidl_srcdir} && ${LINK_COMMAND} && ${PERL} Makefile.PL && make manifypods && rm -f Makefile Makefile.old && rm -f blib')
- t.env.LINK_COMMAND = link_command
+ link_command = 'rm -rf blib && ln -fs blib %s' % blib_bld
+
+ bld.SET_BUILD_GROUP('main')
+ for src, manpage in pidl_manpages.iteritems():
+ bld(rule='pod2man -c "Samba Documentation" ${SRC} ${TGT}',
+ shell=True,
+ source=src,
+ install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
+ target=os.path.basename(manpage))
# we want to prefer the git version of the parsers if we can. Only if the
# source has changed do we want to re-run yapp
@@ -59,7 +66,3 @@ def build(bld):
target='lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm Makefile.PL',
rule='cd ${pidl_srcdir} && ${LINK_COMMAND} && ${PERL} Makefile.PL && make lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm && rm -f Makefile Makefile.old && rm -f blib')
t.env.LINK_COMMAND = link_command
-
- for m in pidl_manpages:
- dname = os.path.dirname(m)[5:]
- bld.INSTALL_FILES('${MANDIR}/'+dname, m, flat=True)
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index cf53bcb..577d495 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -111,7 +111,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
subsystem='ldb',
init_function='LDB_MODULE(samba3sid)',
internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
- deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
+ deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA'
)
diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index da1ba81..d66e7ac 100644
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -3,7 +3,7 @@
bld.SAMBA_SUBSYSTEM('WINSDB',
source='wins/winsdb.c wins/wins_hook.c',
autoproto='wins/winsdb_proto.h',
- public_deps='ldb'
+ public_deps='ldb LDBSAMBA'
)
diff --git a/source4/ntptr/wscript_build b/source4/ntptr/wscript_build
index ee20231..d34d062 100644
--- a/source4/ntptr/wscript_build
+++ b/source4/ntptr/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('ntptr_simple_ldb',
source='simple_ldb/ntptr_simple_ldb.c',
subsystem='ntptr',
init_function='ntptr_simple_ldb_init',
- deps='ldb NDR_SPOOLSS DCERPC_COMMON'
+ deps='ldb NDR_SPOOLSS DCERPC_COMMON LDBSAMBA'
)
diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build
index fc0db09..d86b800 100644
--- a/source4/utils/net/wscript_build
+++ b/source4/utils/net/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_MODULE('net_drs',
source='drs/net_drs.c drs/net_drs_bind.c drs/net_drs_kcc.c drs/net_drs_replicate.c drs/net_drs_showrepl.c',
autoproto='drs/net_drs_proto.h',
subsystem='net',
- deps='LIBCLI_DRSUAPI ldb',
+ deps='LIBCLI_DRSUAPI ldb LDBSAMBA',
internal_module=True
)
--
Samba Shared Repository
More information about the samba-cvs
mailing list