annotate nt/make-nt-depend @ 5136:0f66906b6e37

Undo Assert-equal, Assert=, etc.; make `Assert' handle this automatically -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * test-harness.el (test-harness-from-buffer): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen. tests/ChangeLog addition: 2010-03-12 Ben Wing <ben@xemacs.org> * automated/base64-tests.el (bt-base64-encode-string): * automated/base64-tests.el (bt-base64-decode-string): * automated/base64-tests.el (for): * automated/byte-compiler-tests.el: * automated/byte-compiler-tests.el (before-and-after-compile-equal): * automated/case-tests.el (downcase-string): * automated/case-tests.el (uni-mappings): * automated/ccl-tests.el (ccl-test-normal-expr): * automated/ccl-tests.el (ccl-test-map-instructions): * automated/ccl-tests.el (ccl-test-suites): * automated/database-tests.el (delete-database-files): * automated/extent-tests.el (let): * automated/extent-tests.el (insert): * automated/extent-tests.el (props): * automated/file-tests.el: * automated/file-tests.el (for): * automated/hash-table-tests.el (test): * automated/hash-table-tests.el (for): * automated/hash-table-tests.el (ht): * automated/hash-table-tests.el (iterations): * automated/hash-table-tests.el (h1): * automated/hash-table-tests.el (equal): * automated/hash-table-tests.el (=): * automated/lisp-tests.el: * automated/lisp-tests.el (eq): * automated/lisp-tests.el (test-setq): * automated/lisp-tests.el (my-vector): * automated/lisp-tests.el (x): * automated/lisp-tests.el (equal): * automated/lisp-tests.el (y): * automated/lisp-tests.el (featurep): * automated/lisp-tests.el (=): * automated/lisp-tests.el (six): * automated/lisp-tests.el (three): * automated/lisp-tests.el (one): * automated/lisp-tests.el (two): * automated/lisp-tests.el (five): * automated/lisp-tests.el (test1): * automated/lisp-tests.el (division-test): * automated/lisp-tests.el (for): * automated/lisp-tests.el (check-function-argcounts): * automated/lisp-tests.el (z): * automated/lisp-tests.el (eql): * automated/lisp-tests.el (test-harness-risk-infloops): * automated/lisp-tests.el (erase-buffer): * automated/lisp-tests.el (sym): * automated/lisp-tests.el (new-char): * automated/lisp-tests.el (new-load-file-name): * automated/lisp-tests.el (cl-floor): * automated/lisp-tests.el (foo): * automated/md5-tests.el (lambda): * automated/md5-tests.el (large-string): * automated/md5-tests.el (mapcar): * automated/md5-tests.el (insert): * automated/mule-tests.el: * automated/mule-tests.el (test-chars): * automated/mule-tests.el (existing-file-name): * automated/mule-tests.el (featurep): * automated/query-coding-tests.el (featurep): * automated/regexp-tests.el: * automated/regexp-tests.el (insert): * automated/regexp-tests.el (Assert): * automated/regexp-tests.el (=): * automated/regexp-tests.el (featurep): * automated/regexp-tests.el (text): * automated/regexp-tests.el (text1): * automated/regexp-tests.el ("aáa"): * automated/regexp-tests.el (eql): * automated/search-tests.el (insert): * automated/search-tests.el (featurep): * automated/search-tests.el (let): * automated/search-tests.el (boundp): * automated/symbol-tests.el: * automated/symbol-tests.el (name): * automated/symbol-tests.el (check-weak-list-unique): * automated/symbol-tests.el (string): * automated/symbol-tests.el (list): * automated/symbol-tests.el (foo): * automated/symbol-tests.el (eq): * automated/symbol-tests.el (fresh-keyword-name): * automated/symbol-tests.el (print-gensym): * automated/symbol-tests.el (mysym): * automated/syntax-tests.el (test-forward-word): * automated/syntax-tests.el (test-backward-word): * automated/syntax-tests.el (test-syntax-table): * automated/syntax-tests.el (with-syntax-table): * automated/syntax-tests.el (Skip-Test-Unless): * automated/syntax-tests.el (with): * automated/tag-tests.el (testfile): * automated/weak-tests.el (w): * automated/weak-tests.el (p): * automated/weak-tests.el (a): Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...). Get rid of `Assert-equalp' and friends, `Assert-test', and `Assert-test-not'. Instead, make `Assert' smart enough to do the equivalent functionality when an expression like (Assert (equalp ...)) is seen.
author Ben Wing <ben@xemacs.org>
date Fri, 12 Mar 2010 18:27:51 -0600
parents 4542b72c005e
children 308d34e9f07d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
1 : #-*- Perl -*-
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
2
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
3 # Generate dependency info in a form acceptable to nmake
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
4 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
5 # Copyright (C) 2000, 2002 Jonathan Harris.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
6 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
7 # This file is part of XEmacs.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
8 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
9 # XEmacs is free software; you can redistribute it and/or modify it
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
10 # under the terms of the GNU General Public License as published by the
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
11 # Free Software Foundation; either version 2, or (at your option) any
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
12 # later version.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
13 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
14 # XEmacs is distributed in the hope that it will be useful, but WITHOUT
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
15 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
16 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
17 # for more details.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
18 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
19 # You should have received a copy of the GNU General Public License
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
20 # along with XEmacs; see the file COPYING. If not, write to
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
22 # Boston, MA 02111-1307, USA.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
23 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
24 # Author: Jonathan Harris <jonathan@xemacs.org>
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
25 #
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
26 # Synched up with: Not in FSF.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
27
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
28 use Getopt::Long;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
29
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
30 my $optsok = GetOptions ('src=s' => \$src,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
31 'config=s' => \$config,
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
32 'obj=s' => \$obj);
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
33
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
34 die "Generates nmake dependencies for the XEmacs src directory.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
35
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
36 Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
37
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
38 SRCDIR Location of XEmacs sources
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
39 CONFIGDIR Location of config.inc
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
40 OBJDIR Location for compiler-generated object files
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
41
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
42 Expects output from src/make-src-depend on stdin.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
43 The dependencies are written to stdout.
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
44 " if (@ARGV || !$optsok
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
45 || !defined ($src) || !defined ($config) || !defined ($obj));
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
46
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
47 while (<>)
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
48 {
1111
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
49 # must hack away CRLF junk. wouldn't it be nice if perl handled this
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
50 # right?? really can't be that hard!!!
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
51 s/\r\n/\n/g;
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
52
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
53 # rewrite references to generating script
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
54 s/make-src-depend/make-nt-depend/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
55
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
56 # rewrite '#if defined(...)' into nmake syntax
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
57 s/^#if defined(.+)/!if defined$1/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
58
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
59 # rewrite '#else' and '#endif' into nmake syntax
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
60 s/^#e/!e/;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
61
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
62 # add src path to source filenames
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
63 # allow for source filename being used in variable assignment
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
64 s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g;
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
65
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
66 # add obj path to object filenames
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
67 # rewrite .o to .obj
1330
4542b72c005e [xemacs-hg @ 2003-03-01 07:25:26 by ben]
ben
parents: 1111
diff changeset
68 s/^(.+)\.o:(.+)/$obj\\$1.obj:$2/;
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
69
1330
4542b72c005e [xemacs-hg @ 2003-03-01 07:25:26 by ben]
ben
parents: 1111
diff changeset
70 # add dependency on config.inc wherever config.h is.
4542b72c005e [xemacs-hg @ 2003-03-01 07:25:26 by ben]
ben
parents: 1111
diff changeset
71 s/\\config.h/\\config.h $config\\config.inc/;
1111
184461bc8de4 [xemacs-hg @ 2002-11-18 06:52:23 by ben]
ben
parents: 796
diff changeset
72 print;
796
7a6013500383 [xemacs-hg @ 2002-03-29 11:12:44 by jhar]
jhar
parents:
diff changeset
73 }