pidl:NDR/Client.pm: remove unreached code

[samba.git] / pidl / wscript

diff --git a/pidl/wscript b/pidl/wscript
index 872e2385de28d1ae88ea95a8052dac378b7a29cf..f2b65c864b2c366ad0b8923b5f9bcdde98571b39 100644 (file)
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -11,14 +11,14 @@ def configure(conf):
     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)
+        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')
 
-O755 = 493
 def build(bld):
-    bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=O755)
+    bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=0755)
 
     bld.RECURSE('lib')
 
@@ -28,26 +28,33 @@ 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 = {
+        '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}'
+    }
 
-    pidl_manpages = bld.EXPAND_VARIABLES(pidl_manpages)
+    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('final')
+    if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
+        for src, manpage in pidl_manpages.iteritems():
+            bld(rule='${PERL} ${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
@@ -61,7 +68,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)