Attachment 10428 Details for Bug 10472 – Final patchset for v4-0-test

[patch] Final patchset for v4-0-test

bug-10472-v4-0-test.patch (text/plain), 55.03 KB, created by Stefan Metzmacher on 2014-11-12 10:55:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2014-11-12 10:55:18 UTC

Size: 55.03 KB

patch

obsolete

>From f60c0c51dbc2d2d26fed07c652e2b79a2f39ac76 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Tue, 7 Jan 2014 16:08:50 +1300
>Subject: [PATCH 01/30] docs: update XInclude year to conform with current
> standard
>
>This allows the inbuilt python XML parser to handle these includes.
>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 02379369ef7968f297b8678c9743679b4775662e)
>---
> docs-xml/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index 25e381e..c8a6863 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -93,7 +93,7 @@ def smbdotconf_generate_parameter_list(task):
>     parameter_all = task.outputs[0].bldpath(task.env)
>     articles = task.inputs
> 
>-    t = '<section xmlns:xi="http://www.w3.org/2003/XInclude">\n'
>+    t = '<section xmlns:xi="http://www.w3.org/2001/XInclude">\n'
>     for article in articles:
>         t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n"
>     t += "</section>\n"
>-- 
>1.9.1
>
>
>From 09702e34c6059adcfb83ba39d69152d5d48a8235 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Tue, 7 Jan 2014 17:09:39 +1300
>Subject: [PATCH 02/30] docs: remove the file prefix from included path names
>
>This allows the inbuilt python xml modules to perform the include.
>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 1d68b5b0bb3158cabcd371ab5c24392bcb0a32bd)
>---
> docs-xml/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index c8a6863..59913e8 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -95,7 +95,7 @@ def smbdotconf_generate_parameter_list(task):
> 
>     t = '<section xmlns:xi="http://www.w3.org/2001/XInclude">\n'
>     for article in articles:
>-        t += "<xi:include href='file://" + article.abspath(task.env) + "' parse='xml'/>\n"
>+        t += "<xi:include href='" + article.abspath(task.env) + "' parse='xml'/>\n"
>     t += "</section>\n"
>     save_file(parameter_all, t , create_dir=True)
>     return 0
>-- 
>1.9.1
>
>
>From ec47804d50d928b9425bf3c53873cc69ab50f6f0 Mon Sep 17 00:00:00 2001
>From: Garming Sam <garming@catalyst.net.nz>
>Date: Thu, 9 Jan 2014 12:01:18 +1300
>Subject: [PATCH 03/30] docs: define and include entities for the docs
>
>This allows for dynamic default settings to be generated.
>
>Change-Id: If8b93d233fb941bc7e3073ccf4b5ec0b0a231bd9
>Pair-programmed-with: Andrew Bartlett <abartlet@samba.org>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 57ba012c10fb21f261a3ab9136be05a694278df9)
>---
> buildtools/wafsamba/wafsamba.py |  6 ++++--
> docs-xml/wscript_build          | 19 +++++++++++++++----
> dynconfig/wscript               | 35 +++++++++++++++++++++++++++--------
> 3 files changed, 46 insertions(+), 14 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 47393ad..497f9af 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -806,7 +806,7 @@ def MANPAGES(bld, manpages, install):
>             bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
> Build.BuildContext.MANPAGES = MANPAGES
> 
>-def SAMBAMANPAGES(bld, manpages):
>+def SAMBAMANPAGES(bld, manpages, extra_source=None):
>     '''build and install manual pages'''
>     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
>@@ -814,13 +814,15 @@ def SAMBAMANPAGES(bld, manpages):
> 
>     for m in manpages.split():
>         source = m + '.xml'
>+        if extra_source is not None:
>+            source = [source, extra_source]
>         bld.SAMBA_GENERATOR(m,
>                             source=source,
>                             target=m,
>                             group='final',
>                             rule='''XML_CATALOG_FILES="${SAMBA_CATALOGS}"
>                                     export XML_CATALOG_FILES
>-                                    ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC}
>+                                    ${XSLTPROC} --xinclude --stringparam noreference 0 -o ${TGT}.xml --nonet ${SAMBA_EXPAND_XSL} ${SRC[0].abspath(env)}
>                                     ${XSLTPROC} --nonet -o ${TGT} ${SAMBA_MAN_XSL} ${TGT}.xml'''
>                             )
>         bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True)
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index 59913e8..fc7c54b 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -93,9 +93,19 @@ def smbdotconf_generate_parameter_list(task):
>     parameter_all = task.outputs[0].bldpath(task.env)
>     articles = task.inputs
> 
>-    t = '<section xmlns:xi="http://www.w3.org/2001/XInclude">\n'
>+    entities = bld.pathconfig_entities()
>+    t = "<!DOCTYPE section [\n"
>+
>+    for entity in entities:
>+        t += "%s\n" % entity
>+
>+    t += "]>\n"
>+    t += "<section>\n"
>     for article in articles:
>-        t += "<xi:include href='" + article.abspath(task.env) + "' parse='xml'/>\n"
>+        f = open(article.abspath(task.env), 'r')
>+        t += f.read()
>+        f.close()
>+
>     t += "</section>\n"
>     save_file(parameter_all, t , create_dir=True)
>     return 0
>@@ -107,8 +117,9 @@ def SMBDOTCONF_MANPAGE(bld, target):
>     bld.SAMBA_GENERATOR(parameter_all,
>                         source=articles,
>                         target=parameter_all,
>-                        rule=smbdotconf_generate_parameter_list)
>-    bld.SAMBAMANPAGES(target)
>+                        rule=smbdotconf_generate_parameter_list,
>+                        always=True)
>+    bld.SAMBAMANPAGES(target, parameter_all)
> 
> if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
> 
>diff --git a/dynconfig/wscript b/dynconfig/wscript
>index d1c7a00..ce5212f 100755
>--- a/dynconfig/wscript
>+++ b/dynconfig/wscript
>@@ -349,29 +349,48 @@ def configure(conf):
>         conf.start_msg("Dynconfig[%s]: " % (varname))
>         conf.end_msg("'%s'" % (value), 'GREEN')
> 
>-def dynconfig_cflags(bld, list=None):
>-    '''work out the extra CFLAGS for dynconfig.c'''
>-    cflags = []
>-    # override some paths when running from the build directory
>+def get_override(bld):
>     override = { 'MODULESDIR'    : 'bin/modules',
>                  'PYTHONDIR'     : 'bin/python',
>                  'PYTHONARCHDIR' : 'bin/python',
>                  'BINDIR'        : 'bin',
>                  'SBINDIR'       : 'bin',
>-                 'CODEPAGEDIR'   : os.path.join(bld.env.srcdir, 'codepages'),
>-                 'SCRIPTSBINDIR' : os.path.join(bld.env.srcdir, 'source4/scripting/bin'),
>-                 'SETUPDIR'      : os.path.join(bld.env.srcdir, 'source4/setup') }
>+                 'CODEPAGEDIR'   : 'codepages',
>+                 'SCRIPTSBINDIR' : 'source4/scripting/bin',
>+                 'SETUPDIR'      : 'source4/setup'
>+                 }
>+    return override
>+
>+def dynconfig_cflags(bld, list=None):
>+    '''work out the extra CFLAGS for dynconfig.c'''
>+    cflags = []
>     for varname in dynconfig.keys():
>         if list and not varname in list:
>             continue
>         value = bld.env[varname]
>         if not Options.is_install:
>+            override = get_override(bld)
>             if varname in override:
>-                value = os.path.join(os.getcwd(), override[varname])
>+                value = os.path.join(bld.env.srcdir, override[varname])
>         cflags.append('-D%s="%s"' % (varname, value))
>     return cflags
> Build.BuildContext.dynconfig_cflags = dynconfig_cflags
> 
>+def pathconfig_entities(bld, list=None):
>+    '''work out the extra entities for the docs'''
>+    entities = []
>+    for varname in dynconfig.keys():
>+        if list and not varname in list:
>+            continue
>+        value = bld.env[varname]
>+        if not Options.is_install:
>+            override = get_override(bld)
>+            if varname in override:
>+                value = os.path.join(bld.env.srcdir, override[varname])
>+        entities.append("<!ENTITY pathconfig.%s   '%s'>" % (varname, value))
>+    return entities
>+Build.BuildContext.pathconfig_entities = pathconfig_entities
>+
> def build(bld):
>     cflags = bld.dynconfig_cflags()
>     version_header = 'version.h'
>-- 
>1.9.1
>
>
>From 5b97f9522131ef9fca07fb6dd4b5b5174452f983 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Wed, 15 Jan 2014 18:11:41 +1300
>Subject: [PATCH 04/30] docs: Always declare rule to build parameters.all.xml
> and do it first
>
>This ensures this file and the rule to generate it can always be found.
>
>Andrew Bartlett
>
>Change-Id: I76d9f4470e2678fc2df4e3a13642737128938f3a
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 2c86758b04515998c690f293fada2cc43116d764)
>---
> docs-xml/wscript_build | 15 ++++++++-------
> wscript_build          | 13 +++++++------
> 2 files changed, 15 insertions(+), 13 deletions(-)
>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index fc7c54b..2316f85 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -110,15 +110,16 @@ def smbdotconf_generate_parameter_list(task):
>     save_file(parameter_all, t , create_dir=True)
>     return 0
> 
>+articles = bld.path.ant_glob("smbdotconf/**/*.xml")
>+parameter_all = 'smbdotconf/parameters.all.xml'
>+bld.SAMBA_GENERATOR(parameter_all,
>+                    source=articles,
>+                    target=parameter_all,
>+                    rule=smbdotconf_generate_parameter_list,
>+                    always=True)
>+
> def SMBDOTCONF_MANPAGE(bld, target):
>     ''' assemble and build smb.conf.5 manual page'''
>-    articles = bld.path.ant_glob("smbdotconf/**/*.xml")
>-    parameter_all = 'smbdotconf/parameters.all.xml'
>-    bld.SAMBA_GENERATOR(parameter_all,
>-                        source=articles,
>-                        target=parameter_all,
>-                        rule=smbdotconf_generate_parameter_list,
>-                        always=True)
>     bld.SAMBAMANPAGES(target, parameter_all)
> 
> if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
>diff --git a/wscript_build b/wscript_build
>index f0c9f2a..f28c08c 100644
>--- a/wscript_build
>+++ b/wscript_build
>@@ -27,6 +27,13 @@ bld.SAMBA_MKVERSION('version.h')
> 
> # bld.ENABLE_MAGIC_ORDERING()
> 
>+bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
>+bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
>+bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
>+                   ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
>+                   ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
>+bld.RECURSE('docs-xml')
>+
> bld.RECURSE('lib/replace')
> bld.RECURSE('lib/socket')
> bld.RECURSE('lib/talloc')
>@@ -143,9 +150,3 @@ bld.RECURSE('testsuite/headers')
> bld.SYMBOL_CHECK()
> bld.DUP_SYMBOL_CHECK()
> 
>-bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
>-bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
>-bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
>-                   ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
>-                   ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
>-bld.RECURSE('docs-xml')
>-- 
>1.9.1
>
>
>From 6d9bcd479b513bba416e30cfb71b8b736e0930b5 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 25 Aug 2014 23:38:29 +0200
>Subject: [PATCH 05/30] wafsamba: remove unused variable from
> copy_and_fix_python_path
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit ca06fac2c87d4abe884d2b6e3c1022266b06e287)
>---
> buildtools/wafsamba/wafsamba.py | 2 --
> 1 file changed, 2 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 497f9af..8796cf2 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -703,8 +703,6 @@ def copy_and_fix_python_path(task):
>         replacement="""sys.path.insert(0, "%s")
> sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
> 
>-    shebang = None
>-
>     if task.env["PYTHON"][0] == "/":
>         replacement_shebang = "#!%s\n" % task.env["PYTHON"]
>     else:
>-- 
>1.9.1
>
>
>From 7ad7276a9a102f2e7491210881848e63a30254aa Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 25 Aug 2014 23:39:50 +0200
>Subject: [PATCH 06/30] wafsamba: improve wording in a comment
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 210d7de34f953c308e5fa3db9506796ef2b21688)
>---
> buildtools/wafsamba/wafsamba.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 8796cf2..73f1ae9 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -735,7 +735,7 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
>             destname = os.path.basename(destname)
>     dest = os.path.join(destdir, destname)
>     if python_fixup:
>-        # fixup the python path it will use to find Samba modules
>+        # fix the path python will use to find Samba modules
>         inst_file = file + '.inst'
>         bld.SAMBA_GENERATOR('python_%s' % destname,
>                             rule=copy_and_fix_python_path,
>-- 
>1.9.1
>
>
>From 8bbec66848e0ec1e94e9ddb19da0c983703ca882 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 26 Aug 2014 23:11:39 +0200
>Subject: [PATCH 07/30] wafsamba: fix dependency calculation for
> SAMBA_GENERATOR()
>
>We need to checksum the rule as string command of the
>sourcecode of the python function.
>
>This is stored in the 'ruledeps' envariable on the waf Task.
>See exec_rule() in wafadmin/TaskGen.py.
>
>    dep_vars = getattr(self, 'dep_vars', ['ruledeps'])
>    if dep_vars:
>        tsk.dep_vars = dep_vars
>    if isinstance(self.rule, str):
>        tsk.env.ruledeps = self.rule
>    else:
>        # only works if the function is in a global module such as a waf tool
>        tsk.env.ruledeps = Utils.h_fun(self.rule)
>
>If there's no 'dep_vars' it defaults to ['ruledeps'].
>As we pass our own 'dep_vars' we need to explicitly add
>'ruledeps'.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit ee8fbbd41741e958e0ab6d7b9ab465d664abac60)
>---
> buildtools/wafsamba/wafsamba.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 73f1ae9..1763b00 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -592,6 +592,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>         dep_vars = vars.keys()
>     elif isinstance(vars, list):
>         dep_vars = vars
>+    dep_vars.append('ruledeps')
> 
>     bld.SET_BUILD_GROUP(group)
>     t = bld(
>@@ -603,7 +604,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>         before='cc',
>         ext_out='.c',
>         samba_type='GENERATOR',
>-        dep_vars = [rule] + dep_vars,
>+        dep_vars = dep_vars,
>         name=name)
> 
>     if always:
>-- 
>1.9.1
>
>
>From b5e3848e12d6d9100bfc5b6af0400e3996fbf205 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 26 Aug 2014 23:11:39 +0200
>Subject: [PATCH 08/30] wafsamba: fix dependency for SAMBA_GENERATOR() when
> passing vars!=None
>
>vars can only be a dictionary as that's the only thing bld.EXPAND_VARIABLES()
>accepts.
>
>We need to checksum the whole vars dictionary into the dependencies.
>
>We set task.env.SAMBA_GENERATOR_VARS = vars and add SAMBA_GENERATOR_VARS
>to the dep_vars.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit da8c76354549a64181cffc36e1c0bb0c6c4f87d3)
>---
> buildtools/wafsamba/wafsamba.py | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 1763b00..8deb5a8 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -588,11 +588,8 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>         return
> 
>     dep_vars = []
>-    if isinstance(vars, dict):
>-        dep_vars = vars.keys()
>-    elif isinstance(vars, list):
>-        dep_vars = vars
>     dep_vars.append('ruledeps')
>+    dep_vars.append('SAMBA_GENERATOR_VARS')
> 
>     bld.SET_BUILD_GROUP(group)
>     t = bld(
>@@ -607,6 +604,10 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>         dep_vars = dep_vars,
>         name=name)
> 
>+    if vars is None:
>+        vars = {}
>+    t.env.SAMBA_GENERATOR_VARS = vars
>+
>     if always:
>         t.always = True
> 
>-- 
>1.9.1
>
>
>From 139ad999f3ea7097005865a8bc3005007791a6e7 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 26 Aug 2014 23:11:39 +0200
>Subject: [PATCH 09/30] wafsamba: allow an optional dep_vars list to be passed
> to SAMBA_GENERATOR()
>
>This can be used to checksum variables used in the rule function.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 04bb8ff7e6a3908b952d4d95edc2c7411611ac33)
>---
> buildtools/wafsamba/wafsamba.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 8deb5a8..c3a07e6 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -578,6 +578,7 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>                     public_headers_install=True,
>                     header_path=None,
>                     vars=None,
>+                    dep_vars=[],
>                     always=False):
>     '''A generic source generator target'''
> 
>@@ -587,7 +588,6 @@ def SAMBA_GENERATOR(bld, name, rule, source='', target='',
>     if not enabled:
>         return
> 
>-    dep_vars = []
>     dep_vars.append('ruledeps')
>     dep_vars.append('SAMBA_GENERATOR_VARS')
> 
>-- 
>1.9.1
>
>
>From 27e62db1c45cbdf2d050aa2c958fcf435abf3fbf Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 26 Aug 2014 23:14:23 +0200
>Subject: [PATCH 10/30] wafsamba: fix dependencies on environment variables for
> python_fixup
>
>We now checksum the sourcecode of copy_and_fix_python_path()
>and the env variables used by this function.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 7316653a82fea3dfe1ac8aa89003ce15836a11b9)
>---
> buildtools/wafsamba/wafsamba.py | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index c3a07e6..46309d5 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -741,12 +741,9 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
>         inst_file = file + '.inst'
>         bld.SAMBA_GENERATOR('python_%s' % destname,
>                             rule=copy_and_fix_python_path,
>+                            dep_vars=["PYTHON","PYTHON_SPECIFIED","PYTHONDIR","PYTHONARCHDIR"],
>                             source=file,
>                             target=inst_file)
>-        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONARCHDIR"])
>-        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHONDIR"])
>-        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), str(bld.env["PYTHON_SPECIFIED"]))
>-        bld.add_manual_dependency(bld.path.find_or_declare(inst_file), bld.env["PYTHON"])
>         file = inst_file
>     if base_name:
>         file = os.path.join(base_name, file)
>-- 
>1.9.1
>
>
>From e5e76a3f1c39dad32292239f95b1382756bdbbb9 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 27 Aug 2014 10:08:21 +0200
>Subject: [PATCH 11/30] wafsamba: let SAMBA_BLDOPTIONS() use
> dep_vars=['defines'] instead of always=True
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit a41a9ad0749755d612df81bb77384b4f479e1af2)
>---
> buildtools/wafsamba/samba_patterns.py | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
>index 615d918..953ef49 100644
>--- a/buildtools/wafsamba/samba_patterns.py
>+++ b/buildtools/wafsamba/samba_patterns.py
>@@ -199,6 +199,6 @@ def SAMBA_BLDOPTIONS(bld, target):
>     '''generate the bld_options.c for Samba'''
>     t = bld.SAMBA_GENERATOR(target,
>                             rule=write_build_options,
>-                            target=target,
>-                            always=True)
>+                            dep_vars=['defines'],
>+                            target=target)
> Build.BuildContext.SAMBA_BLDOPTIONS = SAMBA_BLDOPTIONS
>-- 
>1.9.1
>
>
>From a681332cb5dd9f17d8d7689d6bc4611720574a68 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 27 Aug 2014 10:13:09 +0200
>Subject: [PATCH 12/30] dynconfig/wscript: add dynconfig_varnames()
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 32ddd5b6559ad22b2ca84262c396dc889d661bab)
>---
> dynconfig/wscript | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/dynconfig/wscript b/dynconfig/wscript
>index ce5212f..08f4017 100755
>--- a/dynconfig/wscript
>+++ b/dynconfig/wscript
>@@ -376,6 +376,16 @@ def dynconfig_cflags(bld, list=None):
>     return cflags
> Build.BuildContext.dynconfig_cflags = dynconfig_cflags
> 
>+def dynconfig_varnames(bld, list=None):
>+    '''work out the dynconfig variables'''
>+    varnames = []
>+    for varname in dynconfig.keys():
>+        if list and not varname in list:
>+            continue
>+        varnames.append(varname)
>+    return varnames
>+Build.BuildContext.dynconfig_varnames = dynconfig_varnames
>+
> def pathconfig_entities(bld, list=None):
>     '''work out the extra entities for the docs'''
>     entities = []
>-- 
>1.9.1
>
>
>From 7568f1c4a3e27624f91c672fe75a2c3c7cf21c40 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 27 Aug 2014 10:15:56 +0200
>Subject: [PATCH 13/30] docs-xml/wscript_build: pass
> dep_vars=bld.dynconfig_varnames() to SAMBA_GENERATOR()
>
>This avoids the use of always=True.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit de0443ac7690923fa1731560fa51a551711f37fe)
>---
> docs-xml/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
>index 2316f85..f23a210 100644
>--- a/docs-xml/wscript_build
>+++ b/docs-xml/wscript_build
>@@ -116,7 +116,7 @@ bld.SAMBA_GENERATOR(parameter_all,
>                     source=articles,
>                     target=parameter_all,
>                     rule=smbdotconf_generate_parameter_list,
>-                    always=True)
>+                    dep_vars=bld.dynconfig_varnames())
> 
> def SMBDOTCONF_MANPAGE(bld, target):
>     ''' assemble and build smb.conf.5 manual page'''
>-- 
>1.9.1
>
>
>From 9e502ed6d74e1d858345b09a74c689671b8f2c05 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 27 Aug 2014 10:29:50 +0200
>Subject: [PATCH 14/30] lib/ldb/wscript: pass dep_vars=['LDB_VERSION'] to
> SAMBA_GENERATOR()
>
>bld.add_manual_dependency() only works for files not for environment variables.
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit bb9a939e78d54a4b09f38d1f7cec1544239fef34)
>---
> lib/ldb/wscript | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/lib/ldb/wscript b/lib/ldb/wscript
>index f2ea8e1..a95133d 100755
>--- a/lib/ldb/wscript
>+++ b/lib/ldb/wscript
>@@ -148,12 +148,11 @@ def build(bld):
>         # generate a include/ldb_version.h
>         t = bld.SAMBA_GENERATOR('ldb_version.h',
>                                 rule='echo "#define LDB_VERSION \\"${LDB_VERSION}\\"" > ${TGT}',
>+                                dep_vars=['LDB_VERSION'],
>                                 target='include/ldb_version.h',
>                                 public_headers='include/ldb_version.h',
>                                 public_headers_install=not private_library)
>         t.env.LDB_VERSION = VERSION
>-        bld.add_manual_dependency(bld.path.find_or_declare('include/ldb_version.h'), VERSION)
>-
> 
> 
>         bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
>-- 
>1.9.1
>
>
>From 98d44121ae69b62fe43238aaa7540b7c9d8e6db6 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 25 Aug 2014 23:59:46 +0200
>Subject: [PATCH 15/30] dynconfig: implement PERL_LIB_INSTALL_DIR.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit e5d54c5841c003d55960458da29635b3656884df)
>---
> dynconfig/wscript | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/dynconfig/wscript b/dynconfig/wscript
>index 08f4017..944af07 100755
>--- a/dynconfig/wscript
>+++ b/dynconfig/wscript
>@@ -111,6 +111,11 @@ dynconfig = {
>          'FHS-PATH':  '${PYTHONARCHDIR}',
>          'OVERWRITE': True,
>     },
>+    'PERL_LIB_INSTALL_DIR' : {
>+         'STD-PATH':  '${PERL_LIB_INSTALL_DIR}',
>+         'FHS-PATH':  '${PERL_LIB_INSTALL_DIR}',
>+         'OVERWRITE': True,
>+    },
>     'INCLUDEDIR' : {
>          'STD-PATH':  '${INCLUDEDIR}',
>          'FHS-PATH':  '${INCLUDEDIR}/samba-4.0',
>-- 
>1.9.1
>
>
>From d8321958609a0431ea50d93fefd7fdb013779e4d Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 26 Aug 2014 00:41:54 +0200
>Subject: [PATCH 16/30] dynconfig: implement PERL_ARCH_INSTALL_DIR
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 6ad678166c85f0eb90b76ccf842d1aa8dcb6b41a)
>---
> dynconfig/wscript | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/dynconfig/wscript b/dynconfig/wscript
>index 944af07..dc4075a 100755
>--- a/dynconfig/wscript
>+++ b/dynconfig/wscript
>@@ -116,6 +116,11 @@ dynconfig = {
>          'FHS-PATH':  '${PERL_LIB_INSTALL_DIR}',
>          'OVERWRITE': True,
>     },
>+    'PERL_ARCH_INSTALL_DIR' : {
>+         'STD-PATH':  '${PERL_ARCH_INSTALL_DIR}',
>+         'FHS-PATH':  '${PERL_ARCH_INSTALL_DIR}',
>+         'OVERWRITE': True,
>+    },
>     'INCLUDEDIR' : {
>          'STD-PATH':  '${INCLUDEDIR}',
>          'FHS-PATH':  '${INCLUDEDIR}/samba-4.0',
>-- 
>1.9.1
>
>
>From 5a64ac6ba2064cd6dbe9a116843113d6b04b557e Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 26 Aug 2014 01:29:57 +0200
>Subject: [PATCH 17/30] wafsamba: add samba_perl.py with SAMBA_CHECK_PERL()
> higher level check.
>
>This checks for the perl binary, sets PERL and PERL_SPECIFIED
>as well es the PERL_ARCH_INSTALL_DIR and PERL_LIB_INSTALL_DIR.
>
>We want to avoid installing the perl modules outside the prefix.
>I.e. generally,the perl modules should be installed
>under "$prefix/share/perl5".
>
>This improves the fixes for bug #10472.
>
>The new strategy for automatically setting the paths is this:
>
>- if the prefix equals perl's vendorprefix, then
>  - PERL_LIB_INSTALL_DIR is set to perl's vendorlib dir
>  - PERL_ARCH_INSTALL_DIR is set to perl's vendorarch dir
>- otherwise:
>  - PERL_LIB_INSTALL_DIR is set to ${DATADIR}/perl5
>    (usually ${PREFIX}/share/perl5)
>  - PERL_ARCH_INSTALL_DIR is set to ${LIBDIR}/perl5
>    (usually ${PREFIX}/lib/perl5)
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 75c3e240e0703be8c86596e689e466b4dee5e85e)
>---
> buildtools/wafsamba/samba_perl.py | 62 +++++++++++++++++++++++++++++++++++++++
> buildtools/wafsamba/wafsamba.py   |  1 +
> 2 files changed, 63 insertions(+)
> create mode 100644 buildtools/wafsamba/samba_perl.py
>
>diff --git a/buildtools/wafsamba/samba_perl.py b/buildtools/wafsamba/samba_perl.py
>new file mode 100644
>index 0000000..3909aba
>--- /dev/null
>+++ b/buildtools/wafsamba/samba_perl.py
>@@ -0,0 +1,62 @@
>+import Build
>+from samba_utils import *
>+from Configure import conf
>+
>+done = {}
>+
>+@conf
>+def SAMBA_CHECK_PERL(conf, mandatory=True, version=(5,0,0)):
>+    #
>+    # TODO: use the @runonce mechanism for this.
>+    # The problem is that @runonce currently does
>+    # not seem to work together with @conf...
>+    # So @runonce (and/or) @conf needs fixing.
>+    #
>+    if "done" in done:
>+        return
>+    done["done"] = True
>+    conf.find_program('perl', var='PERL', mandatory=mandatory)
>+    conf.check_tool('perl')
>+    path_perl = conf.find_program('perl')
>+    conf.env.PERL_SPECIFIED = (conf.env.PERL != path_perl)
>+    conf.check_perl_version(version)
>+
>+    def read_perl_config_var(cmd):
>+        return Utils.to_list(Utils.cmd_output([conf.env.PERL, '-MConfig', '-e', cmd]))
>+
>+    def check_perl_config_var(var):
>+        conf.start_msg("Checking for perl $Config{%s}:" % var)
>+        try:
>+            v = read_perl_config_var('print $Config{%s}' % var)[0]
>+            conf.end_msg("'%s'" % (v), 'GREEN')
>+            return v
>+        except IndexError:
>+            conf.end_msg(False, 'YELLOW')
>+            pass
>+        return None
>+
>+    vendor_prefix = check_perl_config_var('vendorprefix')
>+
>+    perl_arch_install_dir = None
>+    if vendor_prefix == conf.env.PREFIX:
>+        perl_arch_install_dir = check_perl_config_var('vendorarch');
>+    if perl_arch_install_dir is None:
>+        perl_arch_install_dir = "${LIBDIR}/perl5";
>+    conf.start_msg("PERL_ARCH_INSTALL_DIR: ")
>+    conf.end_msg("'%s'" % (perl_arch_install_dir), 'GREEN')
>+    conf.env.PERL_ARCH_INSTALL_DIR = perl_arch_install_dir
>+
>+    perl_lib_install_dir = None
>+    if vendor_prefix == conf.env.PREFIX:
>+        perl_lib_install_dir = check_perl_config_var('vendorlib');
>+    if perl_lib_install_dir is None:
>+        perl_lib_install_dir = "${DATADIR}/perl5";
>+    conf.start_msg("PERL_LIB_INSTALL_DIR: ")
>+    conf.end_msg("'%s'" % (perl_lib_install_dir), 'GREEN')
>+    conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
>+
>+    perl_inc = read_perl_config_var('print "@INC"')
>+    perl_inc.remove('.')
>+    conf.start_msg("PERL_INC: ")
>+    conf.end_msg("%s" % (perl_inc), 'GREEN')
>+    conf.env.PERL_INC = perl_inc
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 46309d5..bbf3c73 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -16,6 +16,7 @@ from samba_patterns import *
> from samba_pidl import *
> from samba_autoproto import *
> from samba_python import *
>+from samba_perl import *
> from samba_deps import *
> from samba_bundled import *
> import samba_install
>-- 
>1.9.1
>
>
>From 242cd3292626e9590cb6a874455dc74a712ad395 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Tue, 26 Aug 2014 01:31:17 +0200
>Subject: [PATCH 18/30] build: do full SAMBA_CHECK_PERL() check in configure
>
>...instead of only checking for the perl binary
>
>This autodetects PERL_LIB_INSTALL_DIR and removes the
>need of the --with-perl-lib-install-dir when using a --prefix!=/usr.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit 7bf9e937ae59e10a9b40be3a60ffaad49669fb83)
>---
> wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/wscript b/wscript
>index 087e950..85620d6 100644
>--- a/wscript
>+++ b/wscript
>@@ -90,7 +90,7 @@ def configure(conf):
> 
>     conf.RECURSE('lib/replace')
> 
>-    conf.find_program('perl', var='PERL', mandatory=True)
>+    conf.SAMBA_CHECK_PERL(mandatory=True)
>     conf.find_program('xsltproc', var='XSLTPROC')
> 
>     conf.SAMBA_CHECK_PYTHON(mandatory=True)
>-- 
>1.9.1
>
>
>From 32340fb28c2ac4d7e892cfe1aff51fe86682a972 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 4 Sep 2014 01:38:14 +0200
>Subject: [PATCH 19/30] pidl/wscript: don't check for perl again.
>
>This is done at the toplevel now.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 191fc0e541e7c9d0a1095dc287402df9947ce779)
>---
> pidl/wscript | 3 ---
> 1 file changed, 3 deletions(-)
>
>diff --git a/pidl/wscript b/pidl/wscript
>index 4965870..c4edf57 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -29,9 +29,6 @@ def set_options(opt):
>     opt.tool_options('perl')
> 
> 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)
> 
>-- 
>1.9.1
>
>
>From 84fbc787e26025f8bd72fe9e490dee0b1607c6a6 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Wed, 27 Aug 2014 22:19:38 +0200
>Subject: [PATCH 20/30] s3:build: don't detect perl in source3/wscript again.
>
>This is done in the top level now.
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit e7fc38a7df90e26a96ec5573042dccc1746e4f2c)
>---
> source3/wscript | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index 659b316..cb32e60 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -573,7 +573,6 @@ msg.msg_acctrightslen = sizeof(fd);
>         conf.DEFINE('WITH_WINBIND', '1')
> 
>     conf.find_program('awk', var='AWK')
>-    conf.find_program('perl', var='PERL')
> 
>     conf.CHECK_HEADERS('asm/types.h')
> 
>-- 
>1.9.1
>
>
>From 3aafeec33ea11e6c94d83b28b1e15924da2cae1b Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 17 Jul 2014 16:54:54 +0200
>Subject: [PATCH 21/30] wafsamba: add perl_fixup parameter to INSTALL_FILES
>
>This fixes the search path for modules when installing
>a perl "binary" by replacing a line 'use lib "$RealBin/lib";'
>which works for the build directory with the appropriate
>"use lib" line.
>
>This is a step in allowing to install perl modules under the
>prefix directory again.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit f73a0c2af9748d57721211472cd6c50b990ee693)
>---
> buildtools/wafsamba/wafsamba.py | 47 +++++++++++++++++++++++++++++++++++++----
> 1 file changed, 43 insertions(+), 4 deletions(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index bbf3c73..d26b7b5 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -727,9 +727,38 @@ sys.path.insert(1, "%s")""" % (task.env["PYTHONARCHDIR"], task.env["PYTHONDIR"])
>     os.chmod(installed_location, 0755)
>     return 0
> 
>+def copy_and_fix_perl_path(task):
>+    pattern='use lib "$RealBin/lib";'
>+
>+    replacement = ""
>+    if not task.env["PERL_LIB_INSTALL_DIR"] in task.env["PERL_INC"]:
>+         replacement = 'use lib "%s";' % task.env["PERL_LIB_INSTALL_DIR"]
>+
>+    if task.env["PERL"][0] == "/":
>+        replacement_shebang = "#!%s\n" % task.env["PERL"]
>+    else:
>+        replacement_shebang = "#!/usr/bin/env %s\n" % task.env["PERL"]
>+
>+    installed_location=task.outputs[0].bldpath(task.env)
>+    source_file = open(task.inputs[0].srcpath(task.env))
>+    installed_file = open(installed_location, 'w')
>+    lineno = 0
>+    for line in source_file:
>+        newline = line
>+        if lineno == 0 and task.env["PERL_SPECIFIED"] == True and line[:2] == "#!":
>+            newline = replacement_shebang
>+        elif pattern in line:
>+            newline = line.replace(pattern, replacement)
>+        installed_file.write(newline)
>+        lineno = lineno + 1
>+    installed_file.close()
>+    os.chmod(installed_location, 0755)
>+    return 0
>+
> 
> def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
>-                 python_fixup=False, destname=None, base_name=None):
>+                 python_fixup=False, perl_fixup=False,
>+                 destname=None, base_name=None):
>     '''install a file'''
>     destdir = bld.EXPAND_VARIABLES(destdir)
>     if not destname:
>@@ -746,18 +775,28 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False,
>                             source=file,
>                             target=inst_file)
>         file = inst_file
>+    if perl_fixup:
>+        # fix the path perl will use to find Samba modules
>+        inst_file = file + '.inst'
>+        bld.SAMBA_GENERATOR('perl_%s' % destname,
>+                            rule=copy_and_fix_perl_path,
>+                            dep_vars=["PERL","PERL_SPECIFIED","PERL_LIB_INSTALL_DIR"],
>+                            source=file,
>+                            target=inst_file)
>+        file = inst_file
>     if base_name:
>         file = os.path.join(base_name, file)
>     bld.install_as(dest, file, chmod=chmod)
> 
> 
> def INSTALL_FILES(bld, destdir, files, chmod=MODE_644, flat=False,
>-                  python_fixup=False, destname=None, base_name=None):
>+                  python_fixup=False, perl_fixup=False,
>+                  destname=None, base_name=None):
>     '''install a set of files'''
>     for f in TO_LIST(files):
>         install_file(bld, destdir, f, chmod=chmod, flat=flat,
>-                     python_fixup=python_fixup, destname=destname,
>-                     base_name=base_name)
>+                     python_fixup=python_fixup, perl_fixup=perl_fixup,
>+                     destname=destname, base_name=base_name)
> Build.BuildContext.INSTALL_FILES = INSTALL_FILES
> 
> 
>-- 
>1.9.1
>
>
>From 287844f9346654a12788debfaa5660c7a568afe6 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 25 Aug 2014 23:57:23 +0200
>Subject: [PATCH 22/30] pidl: fix the perl module search path (use lib ...)
> when installing pidl.
>
>This way, pidl can also run with modules installed under the $prefix.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit b537c5a340bae2accbf35a4ec5eab7074b90f0b1)
>---
> pidl/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/pidl/wscript b/pidl/wscript
>index c4edf57..0d7626c 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -43,7 +43,7 @@ def configure(conf):
>     conf.find_program('pod2man', var='POD2MAN')
> 
> def build(bld):
>-    bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755)
>+    bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755, perl_fixup=True)
> 
>     bld.RECURSE('lib')
> 
>-- 
>1.9.1
>
>
>From 51e7f7f3aaf092f56cb16a08c1a45193e1310a68 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 25 Aug 2014 23:58:48 +0200
>Subject: [PATCH 23/30] pidl: remove superfluous "use lib ...".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit fac24e11655c554cd3113dfb6fc918a0fd3c880c)
>---
> pidl/pidl | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/pidl/pidl b/pidl/pidl
>index 2a46e92..8887be9 100755
>--- a/pidl/pidl
>+++ b/pidl/pidl
>@@ -404,7 +404,6 @@ pidl README by Andrew Tridgell.
> use strict;
> use FindBin qw($RealBin $Script);
> use lib "$RealBin/lib";
>-use lib "$RealBin/../share/perl5";
> use Getopt::Long;
> use File::Basename;
> use Parse::Pidl qw ( $VERSION );
>-- 
>1.9.1
>
>
>From 840c2d6ae4c1d89df76599d198ad262d284d30f1 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 12 Nov 2014 11:34:00 +0100
>Subject: [PATCH 24/30] Revert "script/autobuild: make use of
> --with-perl-{arch,lib}-install-dir"
>
>This reverts commit d6043d62521391cf9c1d5b0f7f11618c6c3b46fb.
>---
> script/autobuild.py | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/script/autobuild.py b/script/autobuild.py
>index a54cb15..d0d451b 100755
>--- a/script/autobuild.py
>+++ b/script/autobuild.py
>@@ -232,9 +232,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)
>-        perl_vendor_lib = "--with-perl-arch-install-dir=%s/share/perl5 " % self.prefix
>-        perl_vendor_lib += "--with-perl-lib-install-dir=%s/lib/perl5" % self.prefix
>-        self.cmd = self.cmd.replace("${PERL_VENDOR_LIB}", perl_vendor_lib)
>+        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)
>-- 
>1.9.1
>
>
>From 766cdfbdbac3f4275db852b83d3b4e78bbd31807 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Wed, 12 Nov 2014 11:36:13 +0100
>Subject: [PATCH 25/30] Revert "autobuild: Set perl vendorlib direcotry."
>
>This reverts commit 60b8f8f61db0fd85e20a009d7274d19b470fbd65.
>---
> script/autobuild.py | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/script/autobuild.py b/script/autobuild.py
>index d0d451b..8d40851 100755
>--- a/script/autobuild.py
>+++ b/script/autobuild.py
>@@ -59,7 +59,7 @@ tasks = {
>                       ("clean", "make clean", "text/plain") ],
> 
>     # We have 'test' before 'install' because, 'test' should work without 'install'
>-    "samba" : [ ("configure", "./configure.developer ${PREFIX} ${PERL_VENDOR_LIB} --with-selftest-prefix=./bin/ab", "text/plain"),
>+    "samba" : [ ("configure", "./configure.developer ${PREFIX} --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"),
>@@ -77,7 +77,7 @@ tasks = {
>                      ("ctdb-header-install", "cp ./ctdb/include/* ${PREFIX_DIR}/include", "text/plain"),
>                      ("ctdb-header-ls", "ls ${PREFIX_DIR}/include/ctdb.h", "text/plain"),
> 
>-                     ("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"),
>+                     ("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"),
>                      ("make", "make", "text/plain"),
>                      ("check", "./bin/smbd -b | grep CLUSTER_SUPPORT", "text/plain"),
>                      ("install", "make install", "text/plain"),
>@@ -102,7 +102,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,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX} ${PERL_VENDOR_LIB}", "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,!ldb,!pyldb,!tevent,!pytevent --abi-check --enable-debug -C ${PREFIX}", "text/plain"),
>                       ("make", "make", "text/plain"),
>                       ("install", "make install", "text/plain")],
> 
>@@ -232,7 +232,6 @@ 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)
>-- 
>1.9.1
>
>
>From eea99330bacca73af3ddfc2515e13e2b7df5f1ad Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Tue, 26 Aug 2014 21:33:05 +0200
>Subject: [PATCH 26/30] pidl/wscript: remove --with-perl-* options
>
>These are not needed anymore as we have useful defaults now.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Michael Adam <obnox@samba.org>
>(cherry picked from commit ee2148754e2e2604ac918343fa8769a25523eb49)
>---
> pidl/wscript | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/pidl/wscript b/pidl/wscript
>index 0d7626c..27cb230 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -26,7 +26,7 @@ def check_system_perl_module(conf, module, version=None):
>     return True
> 
> def set_options(opt):
>-    opt.tool_options('perl')
>+    return
> 
> def configure(conf):
>     # Check if perl(Parse::Yapp::Driver) is available.
>-- 
>1.9.1
>
>
>From 5db003714997c319d70e3aad32b2d32ed8d09ec0 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 4 Sep 2014 12:45:21 +0200
>Subject: [PATCH 27/30] Revert "wafsamba: Fail with error message if perl
> doesn't provide valid dirs."
>
>This reverts commit 2637890ef42a238093f0f3cbdda0d621d5f9b2e2.
>
>We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
>Everything special is now in buildtools/wafsamba/samba_perl.py.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit c5dd2f18dd09b08758fc68a4aac10cf01d775c85)
>---
> buildtools/wafadmin/Tools/perl.py | 58 +++++++++++++--------------------------
> 1 file changed, 19 insertions(+), 39 deletions(-)
>
>diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
>index 0f34e79..e65ee5c 100644
>--- a/buildtools/wafadmin/Tools/perl.py
>+++ b/buildtools/wafadmin/Tools/perl.py
>@@ -98,53 +98,33 @@ 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]
> 
>-	def try_any(keys):
>-		for k in keys:
>-			conf.start_msg("Checking for perl $Config{%s}:" % k)
>-			try:
>-				v = read_out('print $Config{%s}' % k)[0]
>-				conf.end_msg("'%s'" % (v), 'GREEN')
>-				return v
>-			except IndexError:
>-				conf.end_msg(False, 'YELLOW')
>-				pass
>-		return None
>-
>-	perl_arch_install_dir = None
>-	if getattr(Options.options, 'perl_arch_install_dir', None):
>-		perl_arch_install_dir = Options.options.perl_arch_install_dir
>-	if perl_arch_install_dir is None:
>-		perl_arch_install_dir = try_any(['vendorarch', 'sitearch', 'archlib'])
>-	if perl_arch_install_dir is None:
>-		conf.fatal('No perl arch install directory autodetected.' +
>-			   'Please define it with --with-perl-arch-install-dir.')
>-	conf.start_msg("PERL_ARCH_INSTALL_DIR: ")
>-	conf.end_msg("'%s'" % (perl_arch_install_dir), 'GREEN')
>-	conf.env.PERL_ARCH_INSTALL_DIR = perl_arch_install_dir
>-
>-	perl_lib_install_dir = None
>-	if getattr(Options.options, 'perl_lib_install_dir', None):
>-		perl_lib_install_dir = Options.options.perl_lib_install_dir
>-	if perl_lib_install_dir is None:
>-		perl_lib_install_dir = try_any(['vendorlib', 'sitelib', 'privlib'])
>-	if perl_lib_install_dir is None:
>-		conf.fatal('No perl lib install directory autodetected. ' +
>-			   'Please define it with --with-perl-lib-install-dir.')
>-	conf.start_msg("PERL_LIB_INSTALL_DIR: ")
>-	conf.end_msg("'%s'" % (perl_lib_install_dir), 'GREEN')
>-	conf.env.PERL_LIB_INSTALL_DIR = perl_lib_install_dir
>+	if getattr(Options.options, 'perl_vendorarch_dir', None):
>+		conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir
>+	else:
>+		try:
>+			conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
>+		except IndexError:
>+			conf.env.PERL_VENDORARCH_DIR = "${DATADIR}/perl5"
>+
>+	if getattr(Options.options, 'perl_vendorlib_dir', None):
>+		conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir
>+	else:
>+		try:
>+			conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
>+		except IndexError:
>+			conf.env.PERL_VENDORLIB_DIR = "${LIBDIR}/perl5"
> 
> 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-arch-install-dir",
>+	opt.add_option("--with-perl-vendorarch",
> 		       type="string",
>-		       dest="perl_arch_install_dir",
>+		       dest="perl_vendorarch_dir",
> 		       help = ('Specify directory where to install arch specific files'),
> 		       default=None)
> 
>-	opt.add_option("--with-perl-lib-install-dir",
>+	opt.add_option("--with-perl-vendorlib",
> 		       type="string",
>-		       dest="perl_lib_install_dir",
>+		       dest="perl_vendorlib_dir",
> 		       help = ('Specify directory where to install vendor specific files'),
> 		       default=None)
>-- 
>1.9.1
>
>
>From 14274fe01bc3a1cfe4fc99f8482237cf844c3498 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 4 Sep 2014 12:45:32 +0200
>Subject: [PATCH 28/30] Revert "wafsamba: If perl can't provide defaults,
> define them."
>
>This reverts commit 0ba276ebad57d75a769e22414f94acbe8c177d97.
>
>We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
>Everything special is now in buildtools/wafsamba/samba_perl.py.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 42990ca3c8fa5752280840ea202a537915680b7d)
>---
> buildtools/wafadmin/Tools/perl.py | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
>index e65ee5c..8f13e28 100644
>--- a/buildtools/wafadmin/Tools/perl.py
>+++ b/buildtools/wafadmin/Tools/perl.py
>@@ -101,18 +101,12 @@ def check_perl_ext_devel(conf):
> 	if getattr(Options.options, 'perl_vendorarch_dir', None):
> 		conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir
> 	else:
>-		try:
>-			conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
>-		except IndexError:
>-			conf.env.PERL_VENDORARCH_DIR = "${DATADIR}/perl5"
>+		conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
> 
> 	if getattr(Options.options, 'perl_vendorlib_dir', None):
> 		conf.env.PERL_VENDORLIB_DIR = Options.options.perl_vendorlib_dir
> 	else:
>-		try:
>-			conf.env.PERL_VENDORLIB_DIR = read_out('print $Config{vendorlib}')[0]
>-		except IndexError:
>-			conf.env.PERL_VENDORLIB_DIR = "${LIBDIR}/perl5"
>+		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)
>-- 
>1.9.1
>
>
>From c6e31fcd2bf3a2b2c482e4035c1fb781e01bd717 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 4 Sep 2014 12:45:40 +0200
>Subject: [PATCH 29/30] Revert "buildtools: Add perl vendorlib configure
> option."
>
>This reverts commit 48f0183dbeddd7bdf333a40fe0d3e1c7e7fe00f2.
>
>We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
>Everything special is now in buildtools/wafsamba/samba_perl.py.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>(cherry picked from commit 0b91f7d806b9d18881edb8df981a9eeb057580e5)
>---
> buildtools/wafadmin/Tools/perl.py | 10 ----------
> 1 file changed, 10 deletions(-)
>
>diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
>index 8f13e28..99e0540 100644
>--- a/buildtools/wafadmin/Tools/perl.py
>+++ b/buildtools/wafadmin/Tools/perl.py
>@@ -103,11 +103,6 @@ def check_perl_ext_devel(conf):
> 	else:
> 		conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
> 
>-	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)
> 
>@@ -117,8 +112,3 @@ def set_options(opt):
> 		       help = ('Specify directory where to install arch specific files'),
> 		       default=None)
> 
>-	opt.add_option("--with-perl-vendorlib",
>-		       type="string",
>-		       dest="perl_vendorlib_dir",
>-		       help = ('Specify directory where to install vendor specific files'),
>-		       default=None)
>-- 
>1.9.1
>
>
>From 33159e2f7f1db7af04c305efb8757108f2db0423 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 4 Sep 2014 12:45:48 +0200
>Subject: [PATCH 30/30] Revert "buildtools: Rename perl vendorarch configure
> option."
>
>This reverts commit 04685ff4eed9535769d6a5feee7353f1796a4389.
>
>We are reverting buildtools/wafadmin/Tools/perl.py back to upstream state.
>Everything special is now in buildtools/wafsamba/samba_perl.py.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Stefan Metzmacher <metze@samba.org>
>
>Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
>Autobuild-Date(master): Tue Sep  9 03:07:20 CEST 2014 on sn-devel-104
>
>(cherry picked from commit 1f878b9986523ce9e35dd74ae3c201f4e55f66f3)
>---
> buildtools/wafadmin/Tools/perl.py | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
>diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
>index 99e0540..a6787a8 100644
>--- a/buildtools/wafadmin/Tools/perl.py
>+++ b/buildtools/wafadmin/Tools/perl.py
>@@ -98,17 +98,12 @@ 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, 'perl_vendorarch_dir', None):
>-		conf.env.PERL_VENDORARCH_DIR = Options.options.perl_vendorarch_dir
>+	if getattr(Options.options, 'perlarchdir', None):
>+		conf.env.ARCHDIR_PERL = Options.options.perlarchdir
> 	else:
>-		conf.env.PERL_VENDORARCH_DIR = read_out('print $Config{vendorarch}')[0]
>+		conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[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-vendorarch",
>-		       type="string",
>-		       dest="perl_vendorarch_dir",
>-		       help = ('Specify directory where to install arch specific files'),
>-		       default=None)
>+	opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None)
> 
>-- 
>1.9.1
>

Flags:

obnox: review+

Actions: View

Attachments on bug 10472: 9730 | 9731 | 9753 | 9754 | 9933 | 9934 | 10423 | 10427 | 10428