6685160: fix cscope build with hg
Use hg's fstatus instead of teamware's nametable to trigger cscope database rebuild Reviewed-by: jcoomes, kamg
This commit is contained in:
parent
0ae0691490
commit
8b3a19628f
@ -38,6 +38,7 @@ include $(GAMMADIR)/make/scm.make
|
|||||||
|
|
||||||
NAWK = awk
|
NAWK = awk
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
|
HG = hg
|
||||||
CS_TOP = ../..
|
CS_TOP = ../..
|
||||||
|
|
||||||
CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
|
CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
|
||||||
@ -140,13 +141,17 @@ TAGS.clean: nametable.clean
|
|||||||
|
|
||||||
# .nametable.files and .nametable.files.tmp are used to determine if any files
|
# .nametable.files and .nametable.files.tmp are used to determine if any files
|
||||||
# were added to/deleted from/renamed in the workspace. If not, then there's
|
# were added to/deleted from/renamed in the workspace. If not, then there's
|
||||||
# normally no need to run find. To force a 'find': gmake nametable.clean.
|
# normally no need to rebuild the cscope database. To force a rebuild of
|
||||||
|
# the cscope database: gmake nametable.clean.
|
||||||
.nametable.files: .nametable.files.tmp
|
.nametable.files: .nametable.files.tmp
|
||||||
cmp -s $@ $< || cp $< $@
|
( cmp -s $@ $< ) || ( cp $< $@ )
|
||||||
|
-$(RM) $<
|
||||||
|
|
||||||
.nametable.files.tmp: $(CS_TOP)/Codemgr_wsdata/nametable
|
# `hg status' is slightly faster than `hg fstatus'. Both are
|
||||||
$(NAWK) \
|
# quite a bit slower on an NFS mounted file system, so this is
|
||||||
'{ if (sub("( [a-z0-9]{2,8}){4}$$", "")) print $$0; }' $< > $@
|
# really geared towards repos on local file systems.
|
||||||
|
.nametable.files.tmp:
|
||||||
|
-$(HG) fstatus -acmn > $@
|
||||||
|
|
||||||
nametable.clean:
|
nametable.clean:
|
||||||
-$(RM) .nametable.files .nametable.files.tmp
|
-$(RM) .nametable.files .nametable.files.tmp
|
||||||
|
@ -38,6 +38,7 @@ include $(GAMMADIR)/make/scm.make
|
|||||||
|
|
||||||
NAWK = /usr/xpg4/bin/awk
|
NAWK = /usr/xpg4/bin/awk
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
|
HG = hg
|
||||||
CS_TOP = ../..
|
CS_TOP = ../..
|
||||||
|
|
||||||
CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
|
CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
|
||||||
@ -141,13 +142,17 @@ TAGS.clean: nametable.clean
|
|||||||
|
|
||||||
# .nametable.files and .nametable.files.tmp are used to determine if any files
|
# .nametable.files and .nametable.files.tmp are used to determine if any files
|
||||||
# were added to/deleted from/renamed in the workspace. If not, then there's
|
# were added to/deleted from/renamed in the workspace. If not, then there's
|
||||||
# normally no need to run find. To force a 'find': gmake nametable.clean.
|
# normally no need to rebuild the cscope database. To force a rebuild of
|
||||||
|
# the cscope database: gmake nametable.clean.
|
||||||
.nametable.files: .nametable.files.tmp
|
.nametable.files: .nametable.files.tmp
|
||||||
cmp -s $@ $< || cp $< $@
|
( cmp -s $@ $< ) || ( cp $< $@ )
|
||||||
|
-$(RM) $<
|
||||||
|
|
||||||
.nametable.files.tmp: $(CS_TOP)/Codemgr_wsdata/nametable
|
# `hg status' is slightly faster than `hg fstatus'. Both are
|
||||||
$(NAWK) \
|
# quite a bit slower on an NFS mounted file system, so this is
|
||||||
'{ if (sub("( [a-z0-9]{2,8}){4}$$", "")) print $$0; }' $< > $@
|
# really geared towards repos on local file systems.
|
||||||
|
.nametable.files.tmp:
|
||||||
|
-$(HG) fstatus -acmn > $@
|
||||||
|
|
||||||
nametable.clean:
|
nametable.clean:
|
||||||
-$(RM) .nametable.files .nametable.files.tmp
|
-$(RM) .nametable.files .nametable.files.tmp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user