summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--buildtools/wafsamba/samba_utils.py9
-rw-r--r--pidl/wscript11
2 files changed, 20 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index d3be7945c0..4230d8066f 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -383,3 +383,12 @@ def LOAD_ENVIRONMENT():
env = Environment.Environment()
env.load('bin/c4che/default.cache.py')
return env
+
+
+def IS_NEWER(bld, file1, file2):
+ '''return True if file1 is newer than file2'''
+ t1 = os.stat(os.path.join(bld.curdir, file1)).st_mtime
+ t2 = os.stat(os.path.join(bld.curdir, file2)).st_mtime
+ return t1 > t2
+Build.BuildContext.IS_NEWER = IS_NEWER
+
diff --git a/pidl/wscript b/pidl/wscript
index 733a455059..4d7e468a97 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -13,6 +13,10 @@ def configure(conf):
conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3')
conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
+ # yapp is used for building the parser
+ conf.find_program('yapp', var='YAPP')
+
+
def build(bld):
bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=0755)
@@ -35,6 +39,13 @@ def build(bld):
# use perl to build the manpages
bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
+ # we want to prefer the git version if we can. Only if the
+ # source has changed do we want to re-run yapp
+ if ('YAPP' in bld.env and (
+ bld.IS_NEWER('idl.yp', 'lib/Parse/Pidl/IDL.pm') or
+ bld.IS_NEWER('expr.yp', 'lib/Parse/Pidl/Expr.pm'))):
+ pidl_src.extend(['idl.yp', 'expr.yp'])
+
bld.SAMBA_GENERATOR('pidl_manpages',
source=pidl_src,
target=pidl_manpages,