summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-01-06 13:41:08 +0100
committerStefan Metzmacher <metze@samba.org>2011-01-06 13:43:23 +0100
commitce7cb972b0ba7ec20d05bb1c4243fa0e2b5f05c0 (patch)
tree03369fd04c91e3a85417633d1026fc399a942d8b
parent4de4703bb9f4443278ca1fb5bc3641706f5ca955 (diff)
downloadsamba-ce7cb972b0ba7ec20d05bb1c4243fa0e2b5f05c0.tar.gz
samba-ce7cb972b0ba7ec20d05bb1c4243fa0e2b5f05c0.tar.bz2
samba-ce7cb972b0ba7ec20d05bb1c4243fa0e2b5f05c0.zip
pidl/wscript: only warn about grammar file changes
autobuild should protect us from having grammar files and generated files out of sync. metze
-rw-r--r--pidl/wscript8
1 files changed, 4 insertions, 4 deletions
diff --git a/pidl/wscript b/pidl/wscript
index 150ef41a63..5b3e07c059 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -64,20 +64,20 @@ def build(bld):
bld.IS_NEWER('expr.yp', 'lib/Parse/Pidl/Expr.pm')))
if need_yapp_build:
- Logs.error('''
+ Logs.warn('''
Pidl grammar files have changed. Please use the pidl standalone build
to regenerate them with yapp.
-$ cd pidl
+$ cd ../pidl
$ perl Makefile.PL
$ make lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm
$ git add lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm
$ git commit
+$ cd -
If your 100% sure you haven't changed idl.yp and expr.yp
try this to avoid this message:
-$ touch lib/Parse/Pidl/IDL.pm lib/Parse/Pidl/Expr.pm
+$ touch ../pidl/lib/Parse/Pidl/IDL.pm ../pidl/lib/Parse/Pidl/Expr.pm
''')
- sys.exit(1)