[PATCH (pkgs)] Suppressions for macro error finder
Jerry James
james at xemacs.org
Tue May 22 13:29:34 EDT 2007
PATCH packages
This patch adds the ability to remove certain names from the list of
miscompiled macros generated by gen-macro-err.awk. Each line in the
file macro.suppress (in the top-level directory of the package tree)
should contain the name of one macro to NOT complain about. Stephen
Turnbull requested this feature so that we can strip out all the
read-event and set-buffer-multibyte complaints in the current report.
ChangeLog addition:
2007-05-22 Jerry James <james at xemacs.org>
* .cvsignore: Ignore macro.suppress as well as macro.list.
* find-macro-err.awk: Don't report names found in macro.suppress.
Also, update the FSF's address.
* Local.rules.inc:
* Makefile:
* Version.rules:
* XEmacs.rules:
* gen-macro-list.awk:
* hack-package-index.el:
* iterate-1.rules:
* iterate.rules:
* meta-iterate.rules:
* meta-targets.rules:
* package-clean.el:
* package-compile.el:
* package-net-packages.el: Update the FSF's address.
packages source patch:
Diff command: cvs -q diff -uN
Files affected: package-net-packages.el package-compile.el package-clean.el meta-targets.rules meta-iterate.rules iterate.rules iterate-1.rules hack-package-index.el gen-macro-list.awk find-macro-err.awk XEmacs.rules Version.rules Makefile Local.rules.inc .cvsignore
Index: .cvsignore
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/.cvsignore,v
retrieving revision 1.2
diff -d -u -r1.2 .cvsignore
--- .cvsignore 2002/12/26 11:19:25 1.2
+++ .cvsignore 2007/05/22 17:22:36
@@ -1,4 +1,4 @@
Local.rules
typescripts
id-lisp
-macro.list
+macro.*
Index: Local.rules.inc
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/Local.rules.inc,v
retrieving revision 1.2
diff -d -u -r1.2 Local.rules.inc
--- Local.rules.inc 2004/11/07 23:52:55 1.2
+++ Local.rules.inc 2007/05/22 17:22:36
@@ -16,8 +16,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Requires XEmacs 21.0-beta19 or greater and GNU Make 3.78 or greater.
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/Makefile,v
retrieving revision 1.23
diff -d -u -r1.23 Makefile
--- Makefile 2003/02/05 08:26:43 1.23
+++ Makefile 2007/05/22 17:22:36
@@ -12,8 +12,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
SUBDIRS = xemacs-packages
Index: Version.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/Version.rules,v
retrieving revision 1.4
diff -d -u -r1.4 Version.rules
--- Version.rules 2004/11/07 23:52:55 1.4
+++ Version.rules 2007/05/22 17:22:36
@@ -15,8 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Requires XEmacs 21.0-beta19 or greater and GNU Make 3.78 or greater.
Index: XEmacs.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/XEmacs.rules,v
retrieving revision 1.58
diff -d -u -r1.58 XEmacs.rules
--- XEmacs.rules 2006/05/01 12:03:18 1.58
+++ XEmacs.rules 2007/05/22 17:22:36
@@ -16,8 +16,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Requires XEmacs 21.0-beta19 or greater and GNU Make 3.78 or greater.
Index: find-macro-err.awk
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/find-macro-err.awk,v
retrieving revision 1.2
diff -d -u -r1.2 find-macro-err.awk
--- find-macro-err.awk 2004/01/14 19:20:58 1.2
+++ find-macro-err.awk 2007/05/22 17:22:36
@@ -14,8 +14,8 @@
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# Written by Jerry James
# December 18, 2002
@@ -23,11 +23,14 @@
# Updated January 14, 2004 to also report the type of definition miscompiled
# (defmacro, defsubst, etc.).
#
+# Updated May 22, 2007 to take macro names to be suppressed from the file
+# macro.suppress.
+#
# Find undefined function messages in the smoketest log and try to match them
# against the macro list. Invoke this script in a directory containing
# macro.list, the output of gen-macro-list.awk.
# Usage: awk -f find-macro-err.awk < $package_build_log
-#
+
# Read macro.list into an array and save RS and FS
BEGIN {
OrigRS = RS
@@ -37,6 +40,11 @@
macrotype[$1] = $3
}
close("macro.list")
+ while ((getline < "macro.suppress") > 0) {
+ delete macro[$1]
+ delete macrotype[$1]
+ }
+ close("macro.suppress")
}
# Track the current package/file name from the log
/Compiling .*\.\.\./ {
Index: gen-macro-list.awk
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/gen-macro-list.awk,v
retrieving revision 1.2
diff -d -u -r1.2 gen-macro-list.awk
--- gen-macro-list.awk 2004/01/14 19:20:58 1.2
+++ gen-macro-list.awk 2007/05/22 17:22:36
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# Written by Jerry James
# December 18, 2002
Index: hack-package-index.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/hack-package-index.el,v
retrieving revision 1.6
diff -d -u -r1.6 hack-package-index.el
--- hack-package-index.el 2003/02/05 08:26:43 1.6
+++ hack-package-index.el 2007/05/22 17:22:36
@@ -19,8 +19,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+;; MA 02110-1301, USA.
;;; Synched up with: Not in FSF
Index: iterate-1.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/iterate-1.rules,v
retrieving revision 1.1
diff -d -u -r1.1 iterate-1.rules
--- iterate-1.rules 2004/11/07 23:52:54 1.1
+++ iterate-1.rules 2007/05/22 17:22:36
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
# Avoid duplication between iterate.rules and meta-iterate.rules.
Index: iterate.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/iterate.rules,v
retrieving revision 1.11
diff -d -u -r1.11 iterate.rules
--- iterate.rules 2004/11/07 23:52:54 1.11
+++ iterate.rules 2007/05/22 17:22:36
@@ -14,8 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# This is used by subdirectories that directly contain packages.
Index: meta-iterate.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/meta-iterate.rules,v
retrieving revision 1.7
diff -d -u -r1.7 meta-iterate.rules
--- meta-iterate.rules 2004/11/07 23:52:55 1.7
+++ meta-iterate.rules 2007/05/22 17:22:36
@@ -13,8 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# This is used by higher-level subdirectories that do not directly contain
Index: meta-targets.rules
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/meta-targets.rules,v
retrieving revision 1.1
diff -d -u -r1.1 meta-targets.rules
--- meta-targets.rules 2004/11/07 23:52:54 1.1
+++ meta-targets.rules 2007/05/22 17:22:36
@@ -13,8 +13,8 @@
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
#
# All targets that compile as part of their operation do compilation need
Index: package-clean.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-clean.el,v
retrieving revision 1.1
diff -d -u -r1.1 package-clean.el
--- package-clean.el 2001/03/01 09:04:04 1.1
+++ package-clean.el 2007/05/22 17:22:36
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02111-1301, USA.
;;; Synched up with: Not in FSF
Index: package-compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v
retrieving revision 1.70
diff -d -u -r1.70 package-compile.el
--- package-compile.el 2007/05/07 07:00:46 1.70
+++ package-compile.el 2007/05/22 17:22:37
@@ -20,8 +20,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02111-1301, USA.
;;; Synched up with: Not in FSF
Index: package-net-packages.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-net-packages.el,v
retrieving revision 1.3
diff -d -u -r1.3 package-net-packages.el
--- package-net-packages.el 2003/02/05 08:26:43 1.3
+++ package-net-packages.el 2007/05/22 17:22:37
@@ -18,8 +18,8 @@
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the Free
-;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-;; 02111-1307, USA.
+;; Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02111-1301, USA.
;;; Synched up with: Not in FSF
--
Jerry James, Assistant Professor james at xemacs.org
Computer Science Department http://www.cs.usu.edu/~jerry/
Utah State University
More information about the XEmacs-Patches
mailing list