comparison nt/xemacs.mak @ 776:79940b592197

[xemacs-hg @ 2002-03-15 07:43:14 by ben] .cvsignore: ignore .tmp files that are getting auto-created by VC. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). alloc.c, emacs.c, lisp.h: add new -no-packages. make sure list of args for sorting is actually correct. clean up arg parsing code. xemacs.mak: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. mule\chinese.el, mule\japan-util.el: fix warnings. behavior-defs.el: fix errors with require. bytecomp-runtime.el: add new funs {when,and}-{f}boundp, clean up docs. cus-edit.el: pretty-print values. dump-paths.el, find-paths.el, startup.el, setup-paths.el: fix problems/inconsistencies parsing options. support new -no-packages option. merge code duplication in dump-paths and startup. lisp-mode.el: indent macrolet and labels correctly. update comments about lisp-indent-function. flet already handled in cl. apropos.el, auto-save.el, buff-menu.el, cl-extra.el, dragdrop.el, faces.el, files.el, fill.el, font-lock.el, font.el, gtk-faces.el, gui.el, help.el, hyper-apropos.el, info.el, isearch-mode.el, keymap.el, lisp-mnt.el, mouse.el, package-admin.el, package-get.el, printer.el, process.el, resize-minibuffer.el, simple.el, toolbar-items.el, wid-edit.el, win32-native.el: fix warnings. very-early-lisp.el: update docs. mule\chinese.el, mule\japan-util.el: fix warnings. Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs). Makefile.in.in: Use -no-packages to avoid problems with package files shadowing core files (e.g. unicode.el in mule-ucs).
author ben
date Fri, 15 Mar 2002 07:43:43 +0000
parents 943eaba38521
children 578cb2932d72
comparison
equal deleted inserted replaced
775:7d972c3de90a 776:79940b592197
1 # Makefile for Microsoft NMAKE 1 # Makefile for Microsoft NMAKE
2 # Copyright (C) 1995 Board of Trustees, University of Illinois. 2 # Copyright (C) 1995 Board of Trustees, University of Illinois.
3 # Copyright (C) 1995, 1996, 2000, 2001 Ben Wing. 3 # Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
4 # Copyright (C) 1995 Sun Microsystems, Inc. 4 # Copyright (C) 1995 Sun Microsystems, Inc.
5 # Copyright (C) 1998 Free Software Foundation, Inc. 5 # Copyright (C) 1998 Free Software Foundation, Inc.
6 # 6 #
7 # This file is part of XEmacs. 7 # This file is part of XEmacs.
8 # 8 #
941 $(OUTDIR)\xemacs.res: xemacs.rc 941 $(OUTDIR)\xemacs.res: xemacs.rc
942 rc -Fo$@ xemacs.rc 942 rc -Fo$@ xemacs.rc
943 943
944 944
945 PROGNAME=$(SRC)\xemacs.exe 945 PROGNAME=$(SRC)\xemacs.exe
946 TEMACS_BATCH="$(LIB_SRC)\i" "$(TEMACS)" -batch 946 BATCH = -no-packages -batch
947 XEMACS_BATCH="$(LIB_SRC)\i" "$(PROGNAME)" -vanilla -batch 947 BATCH_PACKAGES = -vanilla -batch
948 TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH)
949 XEMACS_BATCH = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH)
950 XEMACS_BATCH_PACKAGES = "$(LIB_SRC)\i" "$(PROGNAME)" $(BATCH_PACKAGES)
951
948 952
949 # Section handling automated tests starts here 953 # Section handling automated tests starts here
950 954
951 blddir=$(MAKEDIR:\=\\)\\.. 955 blddir=$(MAKEDIR:\=\\)\\..
952 temacs_loadup=$(TEMACS_BATCH) -l $(LISP)/loadup.el 956 temacs_loadup=$(TEMACS_BATCH) -l $(LISP)/loadup.el
953 dump_temacs = $(temacs_loadup) dump 957 dump_temacs = $(temacs_loadup) dump
954 run_temacs = $(temacs_loadup) run-temacs 958 run_temacs = $(temacs_loadup) run-temacs
955 ## We have automated tests!! 959 ## We have automated tests!!
956 testdir=../tests/automated 960 testdir=../tests/automated
957 batch_test_emacs=-batch -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) 961 batch_test_emacs=$(BATCH) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
958 962
959 # .PHONY: check check-temacs 963 # .PHONY: check check-temacs
960 964
961 check: 965 check:
962 cd $(SRC) 966 cd $(SRC)
992 # Section handling tags ends here 996 # Section handling tags ends here
993 997
994 # Section handling info starts here 998 # Section handling info starts here
995 999
996 !if !defined(MAKEINFO) 1000 !if !defined(MAKEINFO)
997 MAKEINFO=$(XEMACS_BATCH) -l texinfmt -f batch-texinfo-format 1001 MAKEINFO=$(XEMACS_BATCH_PACKAGES) -l texinfmt -f batch-texinfo-format
998 !endif 1002 !endif
999 1003
1000 MANDIR = $(XEMACS)\man 1004 MANDIR = $(XEMACS)\man
1001 INFODIR = $(XEMACS)\info 1005 INFODIR = $(XEMACS)\info
1002 INFO_FILES= \ 1006 INFO_FILES= \
1173 1177
1174 makeinfo-test: 1178 makeinfo-test:
1175 @<<makeinfo_test.bat 1179 @<<makeinfo_test.bat
1176 @echo off 1180 @echo off
1177 if exist "$(MAKEINFO)" goto test_done 1181 if exist "$(MAKEINFO)" goto test_done
1178 @$(XEMACS_BATCH) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))" 1182 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
1179 @if not errorlevel 1 goto suggest_makeinfo 1183 @if not errorlevel 1 goto suggest_makeinfo
1180 @echo XEmacs 'info' cannot be built! 1184 @echo XEmacs 'info' cannot be built!
1181 @echo Install XEmacs package 'texinfo' (see README.packages). 1185 @echo Install XEmacs package 'texinfo' (see README.packages).
1182 :suggest_makeinfo 1186 :suggest_makeinfo
1183 @echo Consider specifying path to makeinfo program: MAKEINFO=path 1187 @echo Consider specifying path to makeinfo program: MAKEINFO=path