Mercurial > hg > xemacs-beta

comparison nt/xemacs.mak @ 1657:5c8854104e13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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.
author adrian
date Sun, 31 Aug 2003 17:52:59 +0000
parents 9ced34dff720
children 5c1b34a39cc8
comparison
equal deleted inserted replaced
1656:f8bd59163c60 1657:5c8854104e13
1100 cd $(MANDIR)\new-users-guide 1100 cd $(MANDIR)\new-users-guide
1101 $(MAKEINFO) new-users-guide.texi 1101 $(MAKEINFO) new-users-guide.texi
1102 1102
1103 info: makeinfo-test $(INFO_FILES) 1103 info: makeinfo-test $(INFO_FILES)
1104 1104
1105 makeinfo-test:
1106 @<<makeinfo_test.bat
1107 @echo off
1108 if exist "$(MAKEINFO)" goto test_done
1109 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
1110 @if not errorlevel 1 goto suggest_makeinfo
1111 @echo XEmacs 'info' cannot be built!
1112 @echo Install XEmacs package 'texinfo' (see README.packages).
1113 :suggest_makeinfo
1114 @echo Consider specifying path to 'makeinfo' in config.inc.
1115 @echo as this will build the info docs much faster than XEmacs using 'texinfo'.
1116 @if errorlevel 1 exit 1
1117 :test_done
1118 <<NOKEEP
1119
1120 ########################### Create the Installation file 1105 ########################### Create the Installation file
1121 1106
1122 $(BLDROOT)\Installation:: installation 1107 $(BLDROOT)\Installation:: installation
1123 1108
1124 installation:: 1109 installation::
1283 DO_XEMACS = "$(BLDLIB_SRC)\i" "$(DUMP_TARGET)" 1268 DO_XEMACS = "$(BLDLIB_SRC)\i" "$(DUMP_TARGET)"
1284 1269
1285 BATCH = -no-packages -batch 1270 BATCH = -no-packages -batch
1286 BATCH_PACKAGES = -vanilla -batch 1271 BATCH_PACKAGES = -vanilla -batch
1287 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH) 1272 TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH)
1273 TEMACS_BATCH_PACKAGES = $(DO_TEMACS) -nd $(BATCH_PACKAGES)
1288 XEMACS_BATCH = $(DO_XEMACS) $(BATCH) 1274 XEMACS_BATCH = $(DO_XEMACS) $(BATCH)
1289 XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES) 1275 XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES)
1290 temacs_loadup_args = -l $(LISP)/loadup.el 1276 temacs_loadup_args = -l $(LISP)/loadup.el
1291 dump_temacs_args = $(temacs_loadup_args) dump 1277 dump_temacs_args = $(temacs_loadup_args) dump
1292 run_temacs_args = $(temacs_loadup_args) run-temacs 1278 run_temacs_args = $(temacs_loadup_args) run-temacs
1426 cd $(BLDSRC) 1412 cd $(BLDSRC)
1427 $(DO_XEMACS) $(batch_test_emacs) 1413 $(DO_XEMACS) $(batch_test_emacs)
1428 1414
1429 check-temacs: 1415 check-temacs:
1430 cd $(BLDSRC) 1416 cd $(BLDSRC)
1431 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) 1417 $(TEMACS_BATCH_PACKAGES) $(run_temacs_args) $(batch_test_emacs)
1432 1418
1433 check-features: all 1419 check-features: all
1434 cd $(BLDSRC) 1420 cd $(BLDSRC)
1435 $(XEMACS_BATCH) -l check-features.el 1421 $(XEMACS_BATCH) -l check-features.el
1436 1422
1465 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder" 1451 -$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"
1466 @$(COPY) $(BLDLIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\" 1452 @$(COPY) $(BLDLIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
1467 @$(COPY) $(BLDLIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" 1453 @$(COPY) $(BLDLIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
1468 @$(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" 1454 @$(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
1469 @$(COPY) $(BLDSRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)" 1455 @$(COPY) $(BLDSRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
1456 # APA: This is not good enough! It copies all .#* CVS files
1457 # and the CVS directory too!
1470 @$(COPYDIR) $(SRCROOT)\etc "$(INSTALL_DIR)\etc\" 1458 @$(COPYDIR) $(SRCROOT)\etc "$(INSTALL_DIR)\etc\"
1471 @$(COPYDIR) $(SRCROOT)\info "$(INSTALL_DIR)\info\" 1459 @$(COPYDIR) $(SRCROOT)\info "$(INSTALL_DIR)\info\"
1472 @$(COPYDIR) $(SRCROOT)\lisp "$(INSTALL_DIR)\lisp\" 1460 @$(COPYDIR) $(SRCROOT)\lisp "$(INSTALL_DIR)\lisp\"
1473 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ... 1461 @echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
1474 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\" 1462 @$(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
1572 1560
1573 unicode-encapsulate: 1561 unicode-encapsulate:
1574 cd $(SRC) 1562 cd $(SRC)
1575 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 1563 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
1576 1564
1565 makeinfo-test: $(DUMP_TARGET)
1566 @<<makeinfo_test.bat
1567 @echo off
1568 @"$(MAKEINFO)" --version
1569 @if not errorlevel 1 goto test_done
1570 @$(XEMACS_BATCH_PACKAGES) -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
1571 @if not errorlevel 1 goto suggest_makeinfo
1572 @echo XEmacs 'info' cannot be built!
1573 @echo Install XEmacs package 'texinfo' (see README.packages).
1574 :suggest_makeinfo
1575 @echo Consider specifying path to 'makeinfo' in config.inc.
1576 @echo as this will build the info docs much faster than XEmacs using 'texinfo'.
1577 @if errorlevel 1 exit 1
1578 :test_done
1579 <<NOKEEP