[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu Mar 6 15:31:04 MST 2014
The branch, master has been updated
via ee8f98f pidl-waf: Only install Yapp::Driver if it is not available.
via 9e591e3 pidl-waf: Check for system perl(Parse::Yapp::Driver).
via 410ada4 pidl-waf: Add a function to check for a system perl module.
via b7b0ca1 pidl-waf: Do not glob to install pidl modules.
via 17244ef pidl-waf: Install pidl modules to the perl vendorlib directory.
via 0bb6b01 pidl-waf: Remove unused variable pidl_src.
via 1d95410 autobuild: Set perl vendorlib direcotry.
via 48f0183 buildtools: Add perl vendorlib configure option.
via 04685ff buildtools: Rename perl vendorarch configure option.
via 87976b4 Revert "pidl: Install pidl files corrently."
via c2d58c3 Revert "waf: Add option to specify perl vendor dir."
via c46aaf1 Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."
from d8e110e ctdb-vacuum: fix delete list counts in delete_marshall_traverse_first
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ee8f98f26a3d6f02a0d10ceeac1194675d505246
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 16:00:54 2014 +0100
pidl-waf: Only install Yapp::Driver if it is not available.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Thu Mar 6 23:30:47 CET 2014 on sn-devel-104
commit 9e591e3d619d127c5ec5f6ac86326c84f59878fa
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:59:45 2014 +0100
pidl-waf: Check for system perl(Parse::Yapp::Driver).
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 410ada45b7041be6976fcfefadccbb99212a15a3
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:59:41 2014 +0100
pidl-waf: Add a function to check for a system perl module.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit b7b0ca1ba9067362bb8a4b901f3a7f2f3bcbd6a1
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:55:46 2014 +0100
pidl-waf: Do not glob to install pidl modules.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 17244ef750f699b30ff7ff3a71264f4c76adad6d
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:53:10 2014 +0100
pidl-waf: Install pidl modules to the perl vendorlib directory.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 0bb6b0102f6fa21e6c9f8010421386a660c5a5e0
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:54:09 2014 +0100
pidl-waf: Remove unused variable pidl_src.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 1d954103f582cd219c939606a43112f4374531ff
Author: Andreas Schneider <asn at samba.org>
Date: Wed Mar 5 16:27:15 2014 +0100
autobuild: Set perl vendorlib direcotry.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 48f0183dbeddd7bdf333a40fe0d3e1c7e7fe00f2
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:50:02 2014 +0100
buildtools: Add perl vendorlib configure option.
After this patch has been pushed, we need to change autobuild to compile
with this option or we will not be able to install pidl.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 04685ff4eed9535769d6a5feee7353f1796a4389
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:47:45 2014 +0100
buildtools: Rename perl vendorarch configure option.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:46:01 2014 +0100
Revert "pidl: Install pidl files corrently."
This reverts commit cee11cfa4544425099268cd32393169afb4bb107.
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit c2d58c3c2059ef3d43f876df547cbc7256235563
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:45:51 2014 +0100
Revert "waf: Add option to specify perl vendor dir."
This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83.
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5
Author: Andreas Schneider <asn at samba.org>
Date: Fri Feb 28 15:45:35 2014 +0100
Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional."
This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838.
Reviewed-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafadmin/Tools/perl.py | 26 ++++++++++++------
pidl/lib/wscript_build | 4 +-
pidl/wscript | 50 +++++++++++++++++++-----------------
script/autobuild.py | 7 +++--
4 files changed, 49 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
index 90be8d8..8f13e28 100644
--- a/buildtools/wafadmin/Tools/perl.py
+++ b/buildtools/wafadmin/Tools/perl.py
@@ -98,19 +98,27 @@ def check_perl_ext_devel(conf):
conf.env.EXTUTILS_TYPEMAP = read_out('print "$Config{privlib}/ExtUtils/typemap"')
conf.env.perlext_PATTERN = '%s.' + read_out('print $Config{dlext}')[0]
- if getattr(Options.options, 'perlarchdir', None):
- conf.env.ARCHDIR_PERL = Options.options.perlarchdir
+ if getattr(Options.options, 'perl_vendorarch_dir', None):
+ conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir
else:
- conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0]
+ conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
- conf.env.VENDORDIR_PERL = Options.options.perlvendordir
+ if getattr(Options.options, 'perl_vendorlib_dir', None):
+ conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir
+ else:
+ conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
def set_options(opt):
opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)
- opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None)
- opt.add_option("--with-perl-vendordir",
+ opt.add_option("--with-perl-vendorarch",
+ type="string",
+ dest="perl_vendorarch_dir",
+ help = ('Specify directory where to install arch specific files'),
+ default=None)
+
+ opt.add_option("--with-perl-vendorlib",
type="string",
- dest="perlvendordir",
- help="Specify directory where to install perl vendor files",
- default='${DATAROOTDIR}/perl5/vendor_perl')
+ dest="perl_vendorlib_dir",
+ help = ('Specify directory where to install vendor specific files'),
+ default=None)
diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
index 09d26eb..5023e07 100644
--- a/pidl/lib/wscript_build
+++ b/pidl/lib/wscript_build
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# install the pidl modules
-bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
+bld.INSTALL_FILES(bld.env.PERL_VENDORLIB_DIR,
'''
Parse/Pidl.pm
Parse/Pidl/Samba4.pm
@@ -32,6 +32,6 @@ bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
flat=False)
if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
- bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
+ bld.INSTALL_FILES(bld.env.PERL_VENDORLIB_DIR,
'Parse/Yapp/Driver.pm',
flat=False)
diff --git a/pidl/wscript b/pidl/wscript
index c7b72c4..4965870 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -1,8 +1,30 @@
#!/usr/bin/env python
-import os, sys, Logs, Options
+import os, sys, Logs
from samba_utils import MODE_755
+# This function checks if a perl module is installed on the system.
+def check_system_perl_module(conf, module, version=None):
+ bundle_name = module.replace('::', '_')
+ module_check = module
+ found = False
+
+ # Create module string with version
+ if version:
+ module_check = module + ' ' + str(version)
+
+ # Check if we have to bundle it.
+ if conf.LIB_MUST_BE_BUNDLED(bundle_name.lower()):
+ return False
+
+ # Check for system perl module
+ if not conf.check_perl_module(module_check):
+ return False
+
+ conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1)
+
+ return True
+
def set_options(opt):
opt.tool_options('perl')
@@ -10,6 +32,9 @@ def configure(conf):
conf.check_tool('perl')
conf.check_perl_ext_devel()
+ # Check if perl(Parse::Yapp::Driver) is available.
+ check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
+
# we need a recent version of MakeMaker to get the right man page names
if conf.CHECK_PERL_MANPAGE():
conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1')
@@ -20,9 +45,6 @@ def configure(conf):
conf.find_program('yapp', var='YAPP')
conf.find_program('pod2man', var='POD2MAN')
- # Check for perl(Parse::Yapp::Driver)
- check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
-
def build(bld):
bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755)
@@ -85,23 +107,3 @@ try this to avoid this message:
$ touch ../pidl/lib/Parse/Pidl/IDL.pm ../pidl/lib/Parse/Pidl/Expr.pm
''')
-def check_system_perl_module(conf, module, version=None):
- bundle_name = module.replace('::', '_')
- module_check = module
- found = False
-
- # Create module string with version
- if version:
- module_check = module + ' ' + str(version)
-
- # Check if we have to bundle it.
- if conf.LIB_MUST_BE_BUNDLED(bundle_name.lower()):
- return False
-
- # Check for system perl module
- if not conf.check_perl_module(module_check):
- return False
-
- conf.define('USING_SYSTEM_%s' % bundle_name.upper(), 1)
-
- return True
diff --git a/script/autobuild.py b/script/autobuild.py
index 4af70ee..4fd6ee4 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -45,7 +45,7 @@ tasks = {
("clean", "make clean", "text/plain") ],
# We have 'test' before 'install' because, 'test' should work without 'install'
- "samba" : [ ("configure", "./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab", "text/plain"),
+ "samba" : [ ("configure", "./configure.developer ${PREFIX} ${PERL_VENDOR_LIB} --with-selftest-prefix=./bin/ab", "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1", "text/plain"),
("install", "make install", "text/plain"),
@@ -67,7 +67,7 @@ tasks = {
("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),
# build samba with cluster support against this ctdb:
- ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
+ ("samba-configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure.developer ${PREFIX} ${PERL_VENDOR_LIB} --with-selftest-prefix=./bin/ab --with-cluster-support --with-ctdb-dir=${PREFIX_DIR} --bundled-libraries=!tdb", "text/plain"),
("samba-make", "make", "text/plain"),
("samba-check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
("samba-install", "make install", "text/plain"),
@@ -99,7 +99,7 @@ tasks = {
("ldb-make", "cd lib/ldb && make", "text/plain"),
("ldb-install", "cd lib/ldb && make install", "text/plain"),
- ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ntdb,!pyntdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
+ ("configure", "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure --bundled-libraries=!talloc,!tdb,!pytdb,!ntdb,!pyntdb,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX} ${PERL_VENDOR_LIB}", "text/plain"),
("make", "make", "text/plain"),
("install", "make install", "text/plain"),
("dist", "make dist", "text/plain")],
@@ -230,6 +230,7 @@ class builder(object):
self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
+ self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", "--with-perl-vendorlib=%s/share/perl5" % self.prefix)
# if self.output_mime_type == "text/x-subunit":
# self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
print '%s: [%s] Running %s' % (self.name, self.stage, self.cmd)
--
Samba Shared Repository
More information about the samba-cvs
mailing list