Mercurial > hg > xemacs-beta

diff nt/xemacs.mak @ 1303:f99d3d25df86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2003-02-15 10:15:54 by ben] autoload fixes, make-doc speed improvements Makefile.in.in: Run update-elc-2 with -no-autoloads to avoid multiple autoload-loading problem. configure.usage: Document quick-build better. make-docfile.el: Use `message' (defined in this file) in place of `princ'/`print', and put in a terpri, so that we get correct newline behavior. Rewrite if-progn -> when and a few similar stylistic niceties. And the big change: Allow MS Windows to specify the object files directly and frob them into C files here (formerly this was done in xemacs.mak, and very slooooooooooooooooooowly). Due to line-length limitations in CMD, we need to use a "response file" to hold the arguments, so when we see a response file argument (preceded by an @), read in the args (a bit of trickiness to do this), and process recursively. Also frob .obj -> .c as mentioned earlier and handle other junk dependencies that need to be removed (NEEDTODUMP, make-docfile.exe). update-elc-2.el: Use :test `equal' in call to set-difference. update-elc.el: Put back commented out kill-emacs, update header comment. xemacs.mak: Delete old unused code that checks SATISFIED. Move update-elc-2 up to be near update-elc. Run update-elc-2 with -no-autoloads to avoid multiple autoload-loading problem. Don't compute make-docfile args ourselves. Pass the raw objects to make-docfile.el, which does the computation (much faster than we could). Don't delete the DOC file, split the invocation into two calls to make-docfile.exe (one direct, one through make-docfile.el), etc. In general, all we do is call make-docfile. Add proper dependencies for DOC-file rebuilding so it doesn't get done when not necessary. Implement quick-building here: not building the DOC file unless it doesn't exist, as the quick-build docs say. Makefile.in.in: Don't delete the DOC file. Implement quick-building here: not building the DOC file unless it doesn't exist, as the quick-build docs say. config.h.in, emacs.c: Nothing but niggly spacing changes -- one space before a paren starting a function-call arglist, please.
author ben
date Sat, 15 Feb 2003 10:16:14 +0000
parents 5f2f8dcbfb3e
children 70921960b980
line wrap: on
line diff
--- a/nt/xemacs.mak	Sat Feb 15 00:31:58 2003 +0000
+++ b/nt/xemacs.mak	Sat Feb 15 10:16:14 2003 +0000
@@ -1,7 +1,7 @@
 # Makefile for Microsoft NMAKE	-*- Makefile -*-
 #
 #   Copyright (C) 1995 Board of Trustees, University of Illinois.
-#   Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing.
+#   Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003 Ben Wing.
 #   Copyright (C) 1997, 1998, 2000 Jonathan Harris.
 #   Copyright (C) 1995 Sun Microsystems, Inc.
 #   Copyright (C) 1998 Free Software Foundation, Inc.
@@ -1045,7 +1045,7 @@
 	rc -Fo$@ xemacs.rc
 
 
-PROGNAME=$(TEMACS_DIR)\xemacs.exe
+PROGNAME = $(TEMACS_DIR)\xemacs.exe
 BATCH = -no-packages -batch
 BATCH_PACKAGES = -vanilla -batch
 TEMACS_BATCH = "$(LIB_SRC)\i" "$(TEMACS)" $(BATCH)
@@ -1307,25 +1307,26 @@
 	if exist $(DOC) $(DEL) $(DOC)
 docfile :: $(DOC)
 
-# This takes 5 seconds on my Pentium 233.  If you are running on a
-# much slower machine and are bothered by the time, modify make-docfile.c
-# to contain special code to frob $(OUTDIR)\foo.obj into the right file.
-make-docargs: $(TEMACS_OBJS)
-	@echo Creating make-docfile argument file ...
-	-$(DEL) $(OUTDIR)\make-docfile.tmp
-	@!echo $(SRC)\$(**B).c >> $(OUTDIR)\make-docfile.tmp
-	@echo Done.
-
-$(DOC): $(LIB_SRC)\make-docfile.exe make-docargs
-	if exist $(DOC) $(DEL) $(DOC)
+$(DOC): $(LIB_SRC)\make-docfile.exe $(TEMACS_DIR)\NEEDTODUMP $(TEMACS_OBJS)
 	cd $(TEMACS_DIR)
-	$(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
-	$(LIB_SRC)\make-docfile.exe -a $(DOC) @$(OUTDIR)\make-docfile.tmp
+!if $(QUICK_BUILD)
+	if not exist $(DOC) $(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages @<<
+$(**)
+<<
+!else
+	$(TEMACS_BATCH) -l $(LISP)\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages @<<
+$(**)
+<<
+!endif
 
 update-elc:
 	cd $(TEMACS_DIR)
 	$(TEMACS_BATCH) -l $(LISP)\update-elc.el
 
+# Update out-of-date .elcs, other than needed for dumping.
+update-elc-2:
+	$(XEMACS_BATCH) -no-autoloads -l update-elc-2.el -f batch-update-elc-2 $(LISP)
+
 # This file is touched by update-elc.el when redumping is necessary.
 $(TEMACS_DIR)\NEEDTODUMP :
 	@echo >$(TEMACS_DIR)\NEEDTODUMP
@@ -1333,10 +1334,7 @@
 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
 # requirements have changed.
 
-$(TEMACS_DIR)\SATISFIED: $(PROGNAME)
-
 $(PROGNAME) : $(TEMACS) $(TEMACS_DIR)\NEEDTODUMP
-	@echo >$(TEMACS_DIR)\SATISFIED
 	cd $(TEMACS_DIR)
 	$(TEMACS_BATCH) -l $(LISP)\loadup.el dump
 !if $(USE_PORTABLE_DUMPER)
@@ -1348,8 +1346,6 @@
 <<
 	-$(DEL) $(TEMACS_DIR)\xemacs.dmp
 !endif
-	cd $(NT)
-	@if not exist $(TEMACS_DIR)\SATISFIED $(MAKE) /$(MAKEFLAGS) -nologo -f xemacs.mak $@
 #------------------------------------------------------------------------------
 
 # use this rule to build the complete system
@@ -1599,9 +1595,5 @@
 	@type $(XEMACS)\Installation
 	@echo --------------------------------------------------------------------
 
-# Update out-of-date .elcs, other than needed for dumping.
-update-elc-2:
-	$(XEMACS_BATCH) -l update-elc-2.el -f batch-update-elc-2 $(LISP)
-
 # DO NOT DELETE THIS LINE -- make depend depends on it.