# HG changeset patch
# User adrian
# Date 1062352379 0
# Node ID 5c8854104e1321704f16679d567b9159e8a40bef
# Parent  f8bd59163c60b611bbd6290431f7a3de3e1631d9
[xemacs-hg @ 2003-08-31 17:52:59 by adrian]
[A21.5R21.4] [PATCH] Fix makeinfo-test and check-temacs in nt/xemacs.mak

-------------------- ChangeLog entries follow: --------------------

nt/ChangeLog addition:

2003-08-31  Adrian Aichner  <adrian@xemacs.org>

	* xemacs.mak (makeinfo-test): Moved after variable initialization
	to make test actually work.
	* xemacs.mak (TEMACS_BATCH_PACKAGES): New.
	* xemacs.mak (check-temacs): Use TEMACS_BATCH_PACKAGES to enable
	regression tests requiring packages.

diff -r f8bd59163c60 -r 5c8854104e13 nt/ChangeLog
--- a/nt/ChangeLog	Sun Aug 31 17:30:19 2003 +0000
+++ b/nt/ChangeLog	Sun Aug 31 17:52:59 2003 +0000
@@ -1,3 +1,11 @@
+2003-08-31  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs.mak (makeinfo-test): Moved after variable initialization
+	to make test actually work.
+	* xemacs.mak (TEMACS_BATCH_PACKAGES): New.
+	* xemacs.mak (check-temacs): Use TEMACS_BATCH_PACKAGES to enable
+	regression tests requiring packages.
+
 2003-06-15  Adrian Aichner  <adrian@xemacs.org>
 
 	* minitar.c (main): Handle 0 size files correctly.
diff -r f8bd59163c60 -r 5c8854104e13 nt/xemacs.mak
--- a/nt/xemacs.mak	Sun Aug 31 17:30:19 2003 +0000
+++ b/nt/xemacs.mak	Sun Aug 31 17:52:59 2003 +0000
@@ -1102,21 +1102,6 @@
 
 info:	makeinfo-test $(INFO_FILES)
 
-makeinfo-test:
-	@<<makeinfo_test.bat
-@echo off
-if exist "$(MAKEINFO)" goto test_done
-@$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
-@if not errorlevel 1 goto suggest_makeinfo
-@echo XEmacs 'info' cannot be built!
-@echo Install XEmacs package 'texinfo' (see README.packages).
-:suggest_makeinfo
-@echo Consider specifying path to 'makeinfo' in config.inc.
-@echo as this will build the info docs much faster than XEmacs using 'texinfo'.
-@if errorlevel 1 exit 1
-:test_done
-<<NOKEEP
-
 ########################### Create the Installation file
 
 $(BLDROOT)\Installation::	installation
@@ -1285,6 +1270,7 @@
 BATCH = -no-packages -batch
 BATCH_PACKAGES = -vanilla -batch
 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
+TEMACS_BATCH_PACKAGES = $(DO_TEMACS) -nd $(BATCH_PACKAGES)
 XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
 XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES)
 temacs_loadup_args = -l $(LISP)/loadup.el
@@ -1428,7 +1414,7 @@
 
 check-temacs:
 	cd $(BLDSRC)
-	$(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs)
+	$(TEMACS_BATCH_PACKAGES) $(run_temacs_args) $(batch_test_emacs)
 
 check-features: all
 	cd $(BLDSRC)
@@ -1467,6 +1453,8 @@
 	@$(COPY) $(BLDLIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@$(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@$(COPY) $(BLDSRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+# APA: This is not good enough!  It copies all .#* CVS files
+# and the CVS directory too!
 	@$(COPYDIR) $(SRCROOT)\etc  "$(INSTALL_DIR)\etc\"
 	@$(COPYDIR) $(SRCROOT)\info "$(INSTALL_DIR)\info\"
 	@$(COPYDIR) $(SRCROOT)\lisp "$(INSTALL_DIR)\lisp\"
@@ -1574,3 +1562,18 @@
 	cd $(SRC)
 	perl ../lib-src/make-mswin-unicode.pl --c-output intl-auto-encap-win32.c --h-output intl-auto-encap-win32.h intl-encap-win32.c
 
+makeinfo-test: $(DUMP_TARGET)
+	@<<makeinfo_test.bat
+@echo off
+@"$(MAKEINFO)" --version
+@if not errorlevel 1 goto test_done
+@$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
+@if not errorlevel 1 goto suggest_makeinfo
+@echo XEmacs 'info' cannot be built!
+@echo Install XEmacs package 'texinfo' (see README.packages).
+:suggest_makeinfo
+@echo Consider specifying path to 'makeinfo' in config.inc.
+@echo as this will build the info docs much faster than XEmacs using 'texinfo'.
+@if errorlevel 1 exit 1
+:test_done
+<<NOKEEP