svn commit: samba r22307 - in branches/SAMBA_4_0/source/script: .
metze at samba.org
metze at samba.org
Tue Apr 17 13:48:13 GMT 2007
Author: metze
Date: 2007-04-17 13:48:12 +0000 (Tue, 17 Apr 2007)
New Revision: 22307
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22307
Log:
when no lex or yacc is found:
- just touch $DEST if it's already there and newer than $SRC
- touch $DEST if it's already there but older than $SRC and print warnings
to stderr
- otherwise return an error
when lex or yacc is found:
- just touch $DEST if it's already there and newer than $SRC
- otherwise regenerate $DEST from $SRC using lex or yacc
I don't like that every 'make' tries to regenerate because the timestamp
of $DEST is never updated...
metze
Modified:
branches/SAMBA_4_0/source/script/lex_compile.sh
branches/SAMBA_4_0/source/script/yacc_compile.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/lex_compile.sh
===================================================================
--- branches/SAMBA_4_0/source/script/lex_compile.sh 2007-04-17 13:14:33 UTC (rev 22306)
+++ branches/SAMBA_4_0/source/script/lex_compile.sh 2007-04-17 13:48:12 UTC (rev 22307)
@@ -8,11 +8,23 @@
file=`basename $SRC`
base=`basename $SRC .l`
if [ -z "$LEX" ]; then
- echo "lex not found - not regenerating $DEST"
- exit;
+ # if $DEST is more recent than $SRC, we can just touch
+ # otherwise we touch but print out warnings
+ if [ -r $DEST ]; then
+ if [ x`find $SRC -newer $DEST -print` = x$SRC ]; then
+ echo "warning: lex not found - cannot generate $SRC => $DEST" >&2
+ echo "warning: lex not found - only updating the timestamp of $DEST" >&2
+ fi
+ touch $DEST;
+ exit;
+ fi
+ echo "error: lex not found - cannot generate $SRC => $DEST" >&2
+ exit 1;
fi
+# if $DEST is more recent than $SRC, we can just touch
if [ -r $DEST ]; then
if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
+ touch $DEST;
exit;
fi
fi
Modified: branches/SAMBA_4_0/source/script/yacc_compile.sh
===================================================================
--- branches/SAMBA_4_0/source/script/yacc_compile.sh 2007-04-17 13:14:33 UTC (rev 22306)
+++ branches/SAMBA_4_0/source/script/yacc_compile.sh 2007-04-17 13:48:12 UTC (rev 22307)
@@ -8,18 +8,30 @@
file=`basename $SRC`
base=`basename $SRC .y`
if [ -z "$YACC" ]; then
- echo "yacc not found"
- exit;
+ # if $DEST is more recent than $SRC, we can just touch
+ # otherwise we touch but print out warnings
+ if [ -r $DEST ]; then
+ if [ x`find $SRC -newer $DEST -print` = x$SRC ]; then
+ echo "warning: yacc not found - cannot generate $SRC => $DEST" >&2
+ echo "warning: yacc not found - only updating the timestamp of $DEST" >&2
+ fi
+ touch $DEST;
+ exit;
+ fi
+ echo "error: yacc not found - cannot generate $SRC => $DEST" >&2
+ exit 1;
fi
+# if $DEST is more recent than $SRC, we can just touch
if [ -r $DEST ]; then
if [ x`find $SRC -newer $DEST -print` != x$SRC ]; then
+ touch $DEST;
exit;
fi
fi
TOP=`pwd`
if cd $dir && $YACC -d $file; then
if [ -r y.tab.h -a -r y.tab.c ];then
- echo "move files"
+ #echo "info: move files"
sed -e "/^#/!b" -e "/^#/ s|y\.tab\.h|$SRC|" -e "/^#/ s|\"$base.y|\"$SRC|" y.tab.h > $base.h
sed -e "/^#/ s|y\.tab\.c|$SRC|" -e "/^#/ s|\"$base.y|\"$SRC|" y.tab.c > $base.c
rm -f y.tab.c y.tab.h
More information about the samba-cvs
mailing list