emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r112884: Fix "make TAGS" on MS-Windows.


From: Eli Zaretskii
Subject: [Emacs-diffs] trunk r112884: Fix "make TAGS" on MS-Windows.
Date: Fri, 07 Jun 2013 09:27:05 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 112884
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-06-07 12:26:02 +0300
message:
  Fix "make TAGS" on MS-Windows.
  
   lisp/Makefile.in (TAGS TAGS-LISP): Pass the (long) list of *.el files
   through xargs, to avoid failure due to MS-Windows limitations on
   command-line length.
  
   src/Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files.
   (ctagsfiles3): New variable, includes only *.m files.
   (TAGS): Use an explicit language name in the regular expressions,
   to avoid transformation of '/SOMETHING' by MSYS to
   'c:\MSYS\SOMETHING'.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-07 03:23:57 +0000
+++ b/lisp/ChangeLog    2013-06-07 09:26:02 +0000
@@ -1,3 +1,9 @@
+2013-06-07  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (TAGS TAGS-LISP): Pass the (long) list of *.el files
+       through xargs, to avoid failure due to MS-Windows limitations on
+       command-line length.
+
 2013-06-06  Glenn Morris  <address@hidden>
 
        * font-lock.el (lisp-font-lock-keywords-2):

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2013-05-25 16:05:19 +0000
+++ b/lisp/Makefile.in  2013-06-07 09:26:02 +0000
@@ -209,8 +209,9 @@
        $(emacs) -l authors -f batch-update-authors $(top_srcdir)/etc/AUTHORS 
$(top_srcdir)
 
 TAGS TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) 
$(lisptagsfiles4)
-       els=`echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) 
$(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e 
"s,$(lisp)/ldefs-boot[^ ]*,,"`; \
-       ${ETAGS} -o $@ $$els
+       rm -f $@; touch $@; \
+        echo $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) 
$(lisptagsfiles4) | sed -e "s,$(lisp)/[^ ]*loaddefs[^ ]*,," -e 
"s,$(lisp)/ldefs-boot[^ ]*,," | \
+       xargs $(XARGS_LIMIT) ${ETAGS} -a -o $@
 
 # The src/Makefile.in has its own set of dependencies and when they decide
 # that one Lisp file needs to be re-compiled, we had better recompile it as

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-07 08:08:29 +0000
+++ b/src/ChangeLog     2013-06-07 09:26:02 +0000
@@ -1,3 +1,11 @@
+2013-06-07  Eli Zaretskii  <address@hidden>
+
+       * Makefile.in (ctagsfiles1, ctagsfiles2): Don't include *.m files.
+       (ctagsfiles3): New variable, includes only *.m files.
+       (TAGS): Use an explicit language name in the regular expressions,
+       to avoid transformation of '/SOMETHING' by MSYS to
+       'c:\MSYS\SOMETHING'.
+
 2013-06-07  Richard Copley  <address@hidden>  (tiny change)
 
        * epaths.in: Fix commentary to PATH_SITELOADSEARCH.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2013-06-03 19:06:09 +0000
+++ b/src/Makefile.in   2013-06-07 09:26:02 +0000
@@ -588,13 +588,16 @@
 ## Arrange to make a tags table TAGS-LISP for ../lisp,
 ## plus TAGS for the C files, which includes ../lisp/TAGS by reference.
 
-ctagsfiles1 = [xyzXYZ]*.[hcm]
-ctagsfiles2 = [a-wA-W]*.[hcm]
+ctagsfiles1 = [xyzXYZ]*.[hc]
+ctagsfiles2 = [a-wA-W]*.[hc]
+ctagsfiles3 = [a-zA-Z]*.m
 
 TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE)
        ../lib-src/etags --include=TAGS-LISP --include=$(lwlibdir)/TAGS \
-         --regex='/[   ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
-         $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE)
+         --regex='{c}/[        ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
+         $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) $(S_FILE) \
+         --regex='{objc}/[     ]*DEFVAR_[A-Z_  (]+"\([^"]+\)"/' \
+         $(srcdir)/$(ctagsfiles3)
 frc:
 TAGS-LISP: frc
        $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS=../lib-src/etags


reply via email to

[Prev in Thread] Current Thread [Next in Thread]