libndr: Avoid assigning duplicate versions to symbols

[amitay/samba.git] / pidl / wscript

diff --git a/pidl/wscript b/pidl/wscript
index 05d9982adfecf44c79f44fd28e26dcb735c6561e..50fe12c013dba020e8a50b729bcedfdc7ac5af2c 100644 (file)
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -1,56 +1,38 @@
 #!/usr/bin/env python
 
-import os, sys, Logs
+import os, string
 from samba_utils import MODE_755
+from waflib import Logs, Errors
 
-def set_options(opt):
-    opt.tool_options('perl')
+# This function checks if a perl module is installed on the system.
+def check_system_perl_module(conf, module, version=None):
+    module_check = module
 
-def configure(conf):
-    conf.check_tool('perl')
-    # 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')
-        conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3')
-        conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
-
-    # yapp is used for building the parser
-    conf.find_program('yapp', var='YAPP')
-    conf.find_program('pod2man', var='POD2MAN')
-
-def build(bld):
-    bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755)
+    # Create module string with version
+    if version:
+        module_check = module + ' ' + str(version)
 
-    bld.RECURSE('lib')
+    # Check for system perl module
+    if conf.check_perl_module(module_check) is None:
+        return False
 
-    if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
-        return
+    return True
 
-    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}'
-    }
+def options(opt):
+    return
 
-    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')
+def configure(conf):
+    # Check if perl(Parse::Yapp::Driver) is available.
+    if not check_system_perl_module(conf,
+                                    "Parse::Yapp::Driver",
+                                    1.05):
+        raise Errors.WafError('perl module "Parse::Yapp::Driver" not found')
 
-    blib_bld = os.path.join(bld.srcnode.abspath(bld.env), 'pidl/blib')
+    # yapp is used for building the parser
+    if not conf.find_program('yapp', var='YAPP'):
+        raise Errors.WafError('yapp not found')
 
-    bld.SET_BUILD_GROUP('final')
-    if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
-        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))
+def build(bld):
 
     # 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