summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 22:15:46 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:49 +1000
commita9ea3d6fa510286b83c4bda42c9a857da3625451 (patch)
tree3165b3fc1eb0e8d8099fe9b1ba739ab6208d596a /buildtools
parent9f47c0e7b721561306e7413a412b9e897a0e5b1e (diff)
downloadsamba-a9ea3d6fa510286b83c4bda42c9a857da3625451.tar.gz
samba-a9ea3d6fa510286b83c4bda42c9a857da3625451.tar.bz2
samba-a9ea3d6fa510286b83c4bda42c9a857da3625451.zip
build: cope with the common gen_ndr files being in the git tree
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_pidl.py28
1 files changed, 24 insertions, 4 deletions
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index e76e029a12..d6077c2a4a 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -4,7 +4,10 @@ from TaskGen import before
import Build, os
from samba_utils import *
-def SAMBA_PIDL(bld, pname, source, options='', output_dir='.'):
+def SAMBA_PIDL(bld, pname, source,
+ options='',
+ output_dir='.',
+ symlink=False):
'''Build a IDL file using pidl.
This will produce up to 13 output files depending on the options used'''
@@ -58,7 +61,21 @@ def SAMBA_PIDL(bld, pname, source, options='', output_dir='.'):
t.env.PIDL = "../pidl/pidl"
t.env.OPTIONS = TO_LIST(options)
- t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
+
+ # 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.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
+
+ if not os.path.lexists(outdir):
+ link_source = os.path.normpath(os.path.join(bld.curdir,output_dir))
+ link_source = os_path_relpath(link_source, os.path.dirname(outdir))
+ os.symlink(link_source, outdir)
+
+ real_outputdir = os.path.realpath(outdir)
+ t.env.OUTPUTDIR = os_path_relpath(real_outputdir, bld.bldnode.name + '/..')
if table_header_idx is not None:
pidl_headers = LOCAL_CACHE(bld, 'PIDL_HEADERS')
@@ -68,10 +85,13 @@ def SAMBA_PIDL(bld, pname, source, options='', output_dir='.'):
Build.BuildContext.SAMBA_PIDL = SAMBA_PIDL
-def SAMBA_PIDL_LIST(bld, name, source, options='', output_dir='.'):
+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)
+ bld.SAMBA_PIDL(name, p, options=options, output_dir=output_dir, symlink=symlink)
Build.BuildContext.SAMBA_PIDL_LIST = SAMBA_PIDL_LIST