# waf build tool for building IDL files with pidl
-from TaskGen import taskgen, before
-import Build, os, string, Utils
+from TaskGen import before
+import Build, os
from samba_utils import *
-def SAMBA_PIDL(bld, pname, source, options=''):
+def SAMBA_PIDL(bld, pname, source,
+ options='',
+ output_dir='.',
+ symlink=False):
'''Build a IDL file using pidl.
- This will produce 7 output files'''
+ This will produce up to 13 output files depending on the options used'''
- bname = source[0:-4];
- name = "PIDL_%s" % bname.upper()
+ bname = source[0:-4]; # strip off the .idl suffix
+ name = "%s_%s" % (pname, bname.upper())
if not SET_TARGET_TYPE(bld, name, 'PIDL'):
return
bld.SET_BUILD_GROUP('build_source')
- gen_ndr_dir = '../gen_ndr/'
+ # the output files depend on the options used. Use this dictionary
+ # to map between the options and the resulting file names
+ options_map = { '--header' : '%s.h',
+ '--ndr-parser' : 'ndr_%s.c ndr_%s.h',
+ '--samba3-ndr-server' : 'srv_%s.c srv_%s.h',
+ '--samba3-ndr-client' : 'cli_%s.c cli_%s.h',
+ '--server' : 'ndr_%s_s.c',
+ '--client' : 'ndr_%s_c.c ndr_%s_c.h',
+ '--python' : 'py_%s.c',
+ '--tdr-parser' : 'tdr_%s.c tdr_%s.h',
+ '--dcom-proxy' : '%s_p.c',
+ '--com-header' : 'com_%s.h'
+ }
+
+ table_header_idx = None
out_files = []
- out_files.append(gen_ndr_dir + 'ndr_%s.c' % bname)
- out_files.append(gen_ndr_dir + 'ndr_%s.h' % bname)
- out_files.append(gen_ndr_dir + '%s.h' % bname)
- out_files.append(gen_ndr_dir + 'ndr_%s_s.c' % bname)
- out_files.append(gen_ndr_dir + 'ndr_%s_c.c' % bname)
- out_files.append(gen_ndr_dir + 'ndr_%s_c.h' % bname)
- out_files.append(gen_ndr_dir + 'py_%s.c' % bname)
-
- pidl = bld.srcnode.find_resource('pidl/pidl').relpath_gen(bld.path)
- t = bld(rule='${PIDL} ${PIDL_BUILD_TYPES} ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
- ext_out = '.c',
- before = 'cc',
- shell = False,
- source=source,
- target = out_files,
- name=name)
-
- t.env.PIDL = "../../pidl/pidl"
- t.env.PIDL_BUILD_TYPES = '--header --ndr-parser --client --python --server'.split()
- t.env.OPTIONS = options
- t.env.OUTPUTDIR = bld.BUILD_PATH(gen_ndr_dir)
-
+ options_list = TO_LIST(options)
+
+ for o in options_list:
+ if o in options_map:
+ ofiles = TO_LIST(options_map[o])
+ for f in ofiles:
+ out_files.append(os.path.join(output_dir, f % bname))
+ if f == 'ndr_%s.h':
+ # remember this one for the tables generation
+ table_header_idx = len(out_files) - 1
+
+ # depend on the full pidl sources
+ source = TO_LIST(source)
try:
- bld.PIDL_STUFF[name] = [bld.path.find_or_declare(out_files[1])]
+ pidl_src_nodes = bld.pidl_files_cache
except AttributeError:
- bld.PIDL_STUFF = {}
- bld.PIDL_STUFF[name] = [bld.path.find_or_declare(out_files[1])]
+ bld.pidl_files_cache = bld.srcnode.ant_glob('pidl/lib/Parse/**/*.pm', flat=False)
+ bld.pidl_files_cache.extend(bld.srcnode.ant_glob('pidl', flat=False))
+ pidl_src_nodes = bld.pidl_files_cache
+
+ # the cd .. is needed because pidl currently is sensitive to the directory it is run in
+ t = bld(rule='cd .. && ${PIDL} --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- ${SRC[0].abspath(env)}',
+ ext_out = '.c',
+ before = 'cc',
+ on_results = True,
+ shell = True,
+ source = source,
+ target = out_files,
+ name = name,
+ samba_type = 'PIDL')
+
+ # prime the list of nodes we are dependent on with the cached pidl sources
+ t.allnodes = pidl_src_nodes
+
+ t.env.PIDL = os.path.join(bld.srcnode.abspath(), 'pidl/pidl')
+ t.env.OPTIONS = TO_LIST(options)
+
+ # this rather convoluted set of path calculations is to cope with the possibility
+ # that gen_ndr is a symlink into the source tree. By doing this for the source3
+ # gen_ndr directory we end up generating identical output in gen_ndr for the old
+ # build system and the new one. That makes keeping things in sync much easier.
+ # eventually we should drop the gen_ndr files in git, but in the meanwhile this works
+ outdir = bld.path.find_dir(output_dir).abspath(t.env)
+
+ if symlink and not os.path.lexists(outdir):
+ link_source = os.path.normpath(os.path.join(bld.curdir,output_dir))
+ os.symlink(link_source, outdir)
+
+ real_outputdir = os.path.realpath(outdir)
+ t.env.OUTPUTDIR = os_path_relpath(real_outputdir, os.path.dirname(bld.env.BUILD_DIRECTORY))
+
+ if table_header_idx is not None:
+ pidl_headers = LOCAL_CACHE(bld, 'PIDL_HEADERS')
+ pidl_headers[name] = [bld.path.find_or_declare(out_files[table_header_idx])]
t.more_includes = '#' + bld.path.relpath_gen(bld.srcnode)
Build.BuildContext.SAMBA_PIDL = SAMBA_PIDL
-def SAMBA_PIDL_TDR(bld, pname, source, options=''):
- '''Build a IDL file using pidl.
- This will only produce the header and tdr parser'''
-
- bname = source[0:-4];
- name = "PIDL_%s" % bname.upper()
-
- if not SET_TARGET_TYPE(bld, name, 'PIDL'):
- return
-
- bld.SET_BUILD_GROUP('build_source')
-
- out_files = []
- out_files.append('tdr_%s.c' % bname)
- out_files.append('tdr_%s.h' % bname)
-
- pidl = bld.srcnode.find_resource('pidl/pidl').relpath_gen(bld.path)
- t = bld(rule='${PIDL} ${PIDL_BUILD_TYPES} ${OPTIONS} --outputdir ${TGT[0].parent.abspath(env)} -- ${SRC[0].abspath(env)}',
- ext_out = '.c',
- before = 'cc',
- shell = True,
- source=source,
- target = out_files,
- name=name)
-
- t.env.PIDL = "../../pidl/pidl"
- t.env.PIDL_BUILD_TYPES = '--header --tdr-parser'
- t.env.OPTIONS = options
-
-Build.BuildContext.SAMBA_PIDL_TDR = SAMBA_PIDL_TDR
-
-
-#################################################################
-# define a set of Samba PIDL targets
-def SAMBA_PIDL_LIST(bld, name, source,options=''):
- for p in to_list(source):
- bld.SAMBA_PIDL(name, p, options)
+def SAMBA_PIDL_LIST(bld, name, source,
+ options='',
+ output_dir='.',
+ symlink=False):
+ '''A wrapper for building a set of IDL files'''
+ for p in TO_LIST(source):
+ bld.SAMBA_PIDL(name, p, options=options, output_dir=output_dir, symlink=symlink)
Build.BuildContext.SAMBA_PIDL_LIST = SAMBA_PIDL_LIST
@feature('collect')
@before('exec_rule')
def collect(self):
- for (name, hd) in self.bld.PIDL_STUFF.items():
+ pidl_headers = LOCAL_CACHE(self.bld, 'PIDL_HEADERS')
+ for (name, hd) in pidl_headers.items():
y = self.bld.name_to_obj(name, self.env)
- if not y:
- raise "!"+str(name)
+ self.bld.ASSERT(y is not None, 'Failed to find PIDL header %s' % name)
y.post()
for node in hd:
self.source += " " + node.relpath_gen(self.path)
+
def SAMBA_PIDL_TABLES(bld, name, target):
+ '''generate the pidl NDR tables file'''
headers = bld.env.PIDL_HEADERS
- # this print line should tell us what we ended up with
- # we're ending up with the wrong relative path
- #print "tables target=%s curdir=%s headers=%s" % (target, bld.curdir, headers)
+ bld.SET_BUILD_GROUP('main')
t = bld(
features = 'collect',
- rule='${SRC} --output ${TGT} > ${TGT}',
- ext_out = '.c',
- before = 'cc',
- shell = True,
- source = '../../librpc/tables.pl',
- target=target,
- name=name)
- print name
+ rule = '${SRC} --output ${TGT} | sed "s|default/||" > ${TGT}',
+ ext_out = '.c',
+ before = 'cc',
+ on_results = True,
+ shell = True,
+ source = '../../librpc/tables.pl',
+ target = target,
+ name = name)
+ t.env.LIBRPC = os.path.join(bld.srcnode.abspath(), 'librpc')
Build.BuildContext.SAMBA_PIDL_TABLES = SAMBA_PIDL_TABLES
git.samba.org / samba.git / blobdiff