[PATCH v2 0/2] Makefile: A few fixes to tag generation

[PATCH v2 0/2] Makefile: A few fixes to tag generation

[Peter Xu]

I didn't squash patch 1 because they fix different things at different places
(patch 1 removes the "meson" dir warning on master branch already for gtags).
Patch 2 is the same as posted previous on the list.

Please have a look, thanks.

Peter Xu (2):
  Makefile: Fix gtags generation
  Makefile: Fix cscope issues on MacOS and soft links

 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

-- 
2.31.1

[PATCH v2 1/2] Makefile: Fix gtags generation

[Peter Xu]

We should use "-print" or otherwise all "-prone" is ignored.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 401c623a65..d39d3670de 100644
--- a/Makefile
+++ b/Makefile
@@ -250,7 +250,7 @@ gtags:
 		"GTAGS", "Remove old $@ files")
 	$(call quiet-command, 				\
 	        (cd $(SRC_PATH) && 			\
-		 $(find-src-path) | gtags -f -), 	\
+		 $(find-src-path) -print | gtags -f -),	\
 		"GTAGS", "Re-index $(SRC_PATH)")
 
 .PHONY: TAGS
-- 
2.31.1

[PATCH v2 2/2] Makefile: Fix cscope issues on MacOS and soft links

[Peter Xu]

This patch fixes actually two issues with 'make cscope'.

Firstly, it fixes the command for MacOS "find" command as MacOS will append the
full path of "$(SRC_PATH)/" before each found entry, then after the final "./"
replacement trick it'll look like (e.g., "qapi/qmp-dispatch.c"):

  /qapi/qmp-dispatch.c

Which will point to the root directory instead.

Fix it by simply remove the "/" in "$(SRC_PATH)/" of "find-src-path", then
it'll work for at least both Linux and MacOS.

The other OS-independent issue is to start proactively ignoring soft links when
generating tags, otherwise by default on master branch we'll see this error
when "make cscope":

cscope: cannot find file subprojects/libvhost-user/include/atomic.h

This patch should fix the two issues altogether.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d39d3670de..eeb21f0e6a 100644
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,8 @@ distclean: clean
 	rm -f linux-headers/asm
 	rm -Rf .sdk
 
-find-src-path = find "$(SRC_PATH)/" -path "$(SRC_PATH)/meson" -prune -o \( -name "*.[chsS]" -o -name "*.[ch].inc" \)
+find-src-path = find "$(SRC_PATH)" -path "$(SRC_PATH)/meson" -prune -o \
+	-type l -prune -o \( -name "*.[chsS]" -o -name "*.[ch].inc" \)
 
 .PHONY: ctags
 ctags:
-- 
2.31.1

Re: [PATCH v2 0/2] Makefile: A few fixes to tag generation

[Peter Xu]

On Wed, Aug 04, 2021 at 09:23:26AM -0400, Peter Xu wrote:
> I didn't squash patch 1 because they fix different things at different places
> (patch 1 removes the "meson" dir warning on master branch already for gtags).
> Patch 2 is the same as posted previous on the list.
> 
> Please have a look, thanks.
> 
> Peter Xu (2):
>   Makefile: Fix gtags generation
>   Makefile: Fix cscope issues on MacOS and soft links
> 
>  Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Ping - Anyone would like to pick this up?   Even on linux I still see:

cscope: cannot find file subprojects/libvhost-user/include/atomic.h

Thanks,

-- 
Peter Xu

Re: [PATCH v2 0/2] Makefile: A few fixes to tag generation

[Peter Xu]

On Tue, Sep 07, 2021 at 12:55:09PM -0400, Peter Xu wrote:
> On Wed, Aug 04, 2021 at 09:23:26AM -0400, Peter Xu wrote:
> > I didn't squash patch 1 because they fix different things at different places
> > (patch 1 removes the "meson" dir warning on master branch already for gtags).
> > Patch 2 is the same as posted previous on the list.
> > 
> > Please have a look, thanks.
> > 
> > Peter Xu (2):
> >   Makefile: Fix gtags generation
> >   Makefile: Fix cscope issues on MacOS and soft links
> > 
> >  Makefile | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Ping - Anyone would like to pick this up?   Even on linux I still see:
> 
> cscope: cannot find file subprojects/libvhost-user/include/atomic.h

Ping?

-- 
Peter Xu

Re: [PATCH v2 0/2] Makefile: A few fixes to tag generation

[Peter Xu]

On Wed, Aug 04, 2021 at 09:23:26AM -0400, Peter Xu wrote:
> I didn't squash patch 1 because they fix different things at different places
> (patch 1 removes the "meson" dir warning on master branch already for gtags).
> Patch 2 is the same as posted previous on the list.
> 
> Please have a look, thanks.

Ping again..  comments welcomed..

-- 
Peter Xu

Re: [PATCH v2 0/2] Makefile: A few fixes to tag generation

[Paolo Bonzini]

On 04/08/21 15:23, Peter Xu wrote:
> I didn't squash patch 1 because they fix different things at different places
> (patch 1 removes the "meson" dir warning on master branch already for gtags).
> Patch 2 is the same as posted previous on the list.
> 
> Please have a look, thanks.
> 
> Peter Xu (2):
>    Makefile: Fix gtags generation
>    Makefile: Fix cscope issues on MacOS and soft links
> 
>   Makefile | 5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
> 

Queued, thanks!

Paolo