summaryrefslogtreecommitdiff
path: root/buildtools/wafsamba
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-10-28 19:38:10 +1100
committerAndrew Bartlett <abartlet@samba.org>2012-10-28 19:39:00 +1100
commit06eee7f50b7022451dd9bac39b46e33cd434a186 (patch)
treeea1c90343b66ce11d5de7c8591d7c25e1e065167 /buildtools/wafsamba
parent2756c3ce5c7d5d066dc76592dd1078a8594b983b (diff)
downloadsamba-06eee7f50b7022451dd9bac39b46e33cd434a186.tar.gz
samba-06eee7f50b7022451dd9bac39b46e33cd434a186.tar.bz2
samba-06eee7f50b7022451dd9bac39b46e33cd434a186.zip
build: Remove support for IDL-generated files in git tree
This was added in a9ea3d6fa510286b83c4bda42c9a857da3625451 but is no longer required, as we do not store IDL-generated files in GIT. Andrew Bartlett
Diffstat (limited to 'buildtools/wafsamba')
-rw-r--r--buildtools/wafsamba/samba_pidl.py26
1 files changed, 2 insertions, 24 deletions
diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index ff13971d34..4056359d1c 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -7,7 +7,6 @@ from samba_utils import *
def SAMBA_PIDL(bld, pname, source,
options='',
output_dir='.',
- symlink=False,
generate_tables=True):
'''Build a IDL file using pidl.
This will produce up to 13 output files depending on the options used'''
@@ -91,27 +90,7 @@ def SAMBA_PIDL(bld, pname, source,
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
-
- found_dir = bld.path.find_dir(output_dir)
- if not 'abspath' in dir(found_dir):
- Logs.error('Unable to find pidl output directory %s' %
- os.path.normpath(os.path.join(bld.curdir, output_dir)))
- sys.exit(1)
-
- 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))
+ t.env.OUTPUTDIR = bld.bldnode.name + '/' + bld.path.find_dir(output_dir).bldpath(t.env)
if generate_tables and table_header_idx is not None:
pidl_headers = LOCAL_CACHE(bld, 'PIDL_HEADERS')
@@ -124,11 +103,10 @@ Build.BuildContext.SAMBA_PIDL = SAMBA_PIDL
def SAMBA_PIDL_LIST(bld, name, source,
options='',
output_dir='.',
- symlink=False,
generate_tables=True):
'''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, generate_tables=generate_tables)
+ bld.SAMBA_PIDL(name, p, options=options, output_dir=output_dir, generate_tables=generate_tables)
Build.BuildContext.SAMBA_PIDL_LIST = SAMBA_PIDL_LIST