From bc39054bc3da62ef6220f2bdae36ea9f9096da47 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 28 Feb 2010 17:34:43 +1100 Subject: build: rewrote PIDL rules, breaking them into a separate waf tool --- buildtools/wafsamba/samba_patterns.py | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'buildtools/wafsamba/samba_patterns.py') diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index e6c7f4d3d2..f706895586 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -7,15 +7,6 @@ from Logs import debug from TaskGen import extension from samba_utils import * -########################################################## -# create a node with a new name, based on an existing node -def NEW_NODE(node, name): - ret = node.parent.find_or_declare([name]) - ASSERT(node, ret is not None, "Unable to find new target with name '%s' from '%s'" % ( - name, node.name)) - return ret - - ################################################################################ # a et task which calls out to compile_et to do the work Task.simple_task_type('et', @@ -32,32 +23,6 @@ def process_et(self, node): -################################################################################ -# a idl task which calls out to pidl to do the work -Task.simple_task_type('idl', '../../pidl/pidl ${TGT[0].options} --header --ndr-parser --client --python --server --outputdir=${TGT[0].outputdir} -- ${SRC}', color='BLUE', ext_out='.c') - -@extension('.idl') -def process_idl(self, node): - bname = node.file_base() - gen_ndr = "../gen_ndr/" - c_node = NEW_NODE(node, gen_ndr + 'ndr_%s.c' % bname) - h1_node = NEW_NODE(node, gen_ndr + '%s.h' % bname) - h2_node = NEW_NODE(node, gen_ndr + 'ndr_%s.h' % bname) - s_node = NEW_NODE(node, gen_ndr + 'ndr_%s_s.c' % bname) - cli_node = NEW_NODE(node, gen_ndr + 'ndr_%s_c.c' % bname) - cli_h_node = NEW_NODE(node, gen_ndr + 'ndr_%s_c.h' % bname) - py_node = NEW_NODE(node, gen_ndr + 'py_%s.c' % bname) - - dname = os.path.dirname(node.bld_dir(self.env)) + "/gen_ndr" - c_node.outputdir = dname - c_node.options = self.options - - self.create_task('idl', node, [c_node, h1_node, h2_node, s_node, cli_node, cli_h_node, py_node]) - - # reinject the c node to the list of nodes to process - self.allnodes.append(c_node) - - ################################################################################ -- cgit