Mon, 14 Apr 2008 08:29:41 -0700
Merge
1.1 --- a/build/linux/makefiles/cscope.make Wed Apr 09 15:10:22 2008 -0700 1.2 +++ b/build/linux/makefiles/cscope.make Mon Apr 14 08:29:41 2008 -0700 1.3 @@ -38,6 +38,7 @@ 1.4 1.5 NAWK = awk 1.6 RM = rm -f 1.7 +HG = hg 1.8 CS_TOP = ../.. 1.9 1.10 CSDIRS = $(CS_TOP)/src $(CS_TOP)/build 1.11 @@ -140,13 +141,17 @@ 1.12 1.13 # .nametable.files and .nametable.files.tmp are used to determine if any files 1.14 # were added to/deleted from/renamed in the workspace. If not, then there's 1.15 -# normally no need to run find. To force a 'find': gmake nametable.clean. 1.16 +# normally no need to rebuild the cscope database. To force a rebuild of 1.17 +# the cscope database: gmake nametable.clean. 1.18 .nametable.files: .nametable.files.tmp 1.19 - cmp -s $@ $< || cp $< $@ 1.20 + ( cmp -s $@ $< ) || ( cp $< $@ ) 1.21 + -$(RM) $< 1.22 1.23 -.nametable.files.tmp: $(CS_TOP)/Codemgr_wsdata/nametable 1.24 - $(NAWK) \ 1.25 - '{ if (sub("( [a-z0-9]{2,8}){4}$$", "")) print $$0; }' $< > $@ 1.26 +# `hg status' is slightly faster than `hg fstatus'. Both are 1.27 +# quite a bit slower on an NFS mounted file system, so this is 1.28 +# really geared towards repos on local file systems. 1.29 +.nametable.files.tmp: 1.30 + -$(HG) fstatus -acmn > $@ 1.31 1.32 nametable.clean: 1.33 -$(RM) .nametable.files .nametable.files.tmp
2.1 --- a/build/solaris/makefiles/cscope.make Wed Apr 09 15:10:22 2008 -0700 2.2 +++ b/build/solaris/makefiles/cscope.make Mon Apr 14 08:29:41 2008 -0700 2.3 @@ -38,6 +38,7 @@ 2.4 2.5 NAWK = /usr/xpg4/bin/awk 2.6 RM = rm -f 2.7 +HG = hg 2.8 CS_TOP = ../.. 2.9 2.10 CSDIRS = $(CS_TOP)/src $(CS_TOP)/build 2.11 @@ -141,13 +142,17 @@ 2.12 2.13 # .nametable.files and .nametable.files.tmp are used to determine if any files 2.14 # were added to/deleted from/renamed in the workspace. If not, then there's 2.15 -# normally no need to run find. To force a 'find': gmake nametable.clean. 2.16 +# normally no need to rebuild the cscope database. To force a rebuild of 2.17 +# the cscope database: gmake nametable.clean. 2.18 .nametable.files: .nametable.files.tmp 2.19 - cmp -s $@ $< || cp $< $@ 2.20 + ( cmp -s $@ $< ) || ( cp $< $@ ) 2.21 + -$(RM) $< 2.22 2.23 -.nametable.files.tmp: $(CS_TOP)/Codemgr_wsdata/nametable 2.24 - $(NAWK) \ 2.25 - '{ if (sub("( [a-z0-9]{2,8}){4}$$", "")) print $$0; }' $< > $@ 2.26 +# `hg status' is slightly faster than `hg fstatus'. Both are 2.27 +# quite a bit slower on an NFS mounted file system, so this is 2.28 +# really geared towards repos on local file systems. 2.29 +.nametable.files.tmp: 2.30 + -$(HG) fstatus -acmn > $@ 2.31 2.32 nametable.clean: 2.33 -$(RM) .nametable.files .nametable.files.tmp