diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-20 17:49:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:31 -0500 |
| commit | 920a627ba814d78a1765a6c1c7209ff29acc6153 (patch) | |
| tree | 193937ab55ada69c24f970dc00d722e03980a466 /source4/build/scons/pidl.py | |
| parent | 5c40f9cd9b59041b3382ec24a1091a60134dd8c5 (diff) | |
| download | samba-920a627ba814d78a1765a6c1c7209ff29acc6153.tar.gz samba-920a627ba814d78a1765a6c1c7209ff29acc6153.tar.bz2 samba-920a627ba814d78a1765a6c1c7209ff29acc6153.zip | |
r10356: Make the proto generator work with scons
(This used to be commit a2268f1dd441059955bee30cf2a9028656c14099)
Diffstat (limited to 'source4/build/scons/pidl.py')
| -rw-r--r-- | source4/build/scons/pidl.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source4/build/scons/pidl.py b/source4/build/scons/pidl.py index c0c29d2035..6bddea3ee4 100644 --- a/source4/build/scons/pidl.py +++ b/source4/build/scons/pidl.py @@ -16,17 +16,10 @@ pidl_builder = SCons.Builder.Builder(action='$PIDLCOM', scanner = idl_scanner) def generate(env): - env['PIDL'] = 'pidl' - env['PIDLCPP'] = env['CPP'] - env['PIDLFLAGS'] = [] - env['PIDLCOM'] = 'CPP=$PIDLCPP $PIDL $PIDLFLAGS -- $SOURCE' - env['BUILDERS']['NdrMarshaller'] = pidl_builder + env['PIDL'] = env.Detect('pidl') or './pidl/pidl' + env['PIDLFLAGS'] = [] + env['PIDLCOM'] = 'CPP=$CPP $PIDL $PIDLFLAGS -- $SOURCE' + env['BUILDERS']['NdrMarshaller'] = pidl_builder def exists(env): - if (env.Detect('./pidl/pidl')): - return 1 - - if (env.Detect('pidl')): - return 1 - - return 0 + return env.Detect(['./pidl/pidl','pidl']) |