[Emacs-diffs] trunk r117446: * update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in

[Glenn Morris]

------------------------------------------------------------
revno: 117446
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-29 17:01:51 -0700
message:
  * update_autogen: Find loaddefs targets rather than parsing lisp/Makefile.in
  
  * lisp/Makefile.in: Comment.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/update_autogen           
update_autogen-20110320234513-evoa2jhg3q7dkdg8-8
  lisp/Makefile.in               
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-06-29 01:33:32 +0000
+++ b/admin/ChangeLog   2014-06-30 00:01:51 +0000
@@ -1,3 +1,8 @@
+2014-06-30  Glenn Morris  <address@hidden>
+
+       * update_autogen: Find loaddefs targets rather than
+       parsing lisp/Makefile.in
+
 2014-06-29  Glenn Morris  <address@hidden>
 
        * update_autogen: Remove need to cd into/out of lisp/.

=== modified file 'admin/update_autogen'
--- a/admin/update_autogen      2014-06-29 01:33:32 +0000
+++ b/admin/update_autogen      2014-06-30 00:01:51 +0000
@@ -322,15 +322,19 @@
 
 echo "Finding loaddef targets..."
 
-sed -n -e '/^AUTOGEN_VCS/,/^$/p' lisp/Makefile.in | \
-    sed -e '/AUTOGEN_VCS/d' -e '/^$/d' -e 's/\\//' \
-    >| $tempfile || die "sed error"
+find lisp -name '*.el' -exec grep '^;.*generated-autoload-file:' {} + | \
+    sed -e '/loaddefs\|esh-groups/d' -e 's|/[^/]*: "|/|' -e 's/"//g' \
+    >| $tempfile || die "Error finding targets"
 
 genfiles=
 
 while read genfile; do
 
-    genfile=lisp/$genfile
+    ## Or we can just use sort -u when making tempfile...
+    case " $genfiles " in
+        *" $genfile "*) continue ;;
+    esac
+
     [ -r $genfile ] || die "Unable to read $genfile"
 
     genfiles="$genfiles $genfile"

=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in  2014-06-28 01:26:09 +0000
+++ b/lisp/Makefile.in  2014-06-30 00:01:51 +0000
@@ -71,7 +71,6 @@
        org/org-loaddefs.el
 
 # Versioned files that are the value of someone's `generated-autoload-file'.
-# Note that update_loaddefs parses this.
 AUTOGEN_VCS = \
        ps-print.el \
        obsolete/tpu-edt.el \