X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=make.bat;h=cbd49dfa3d63eedc1eb0a75f469c0b33c5d895e9;hb=ded3fe4b0f66f247c5904d5943ffba9295038ba5;hp=4a6b8a0c87f7514c7c3d52235697fa2ae659e693;hpb=5b18f44a7745e8fd9b916161333dd5c43622a65b;p=elisp%2Fgnus.git-

diff --git a/make.bat b/make.bat
index 4a6b8a0..cbd49df 100755
--- a/make.bat
+++ b/make.bat
@@ -1,14 +1,14 @@
 @echo off
 
-rem Written by David Charlap <shamino@writeme.com>
-
-rem There are two catches, however.  The emacs.bat batch file may not exist
-rem in all distributions.  It is part of the Voelker build of Emacs 19.34
-rem (http://www.cs.washington.edu/homes/voelker/ntemacs.html).  If the user
-rem installs Gnus with some other build, he may have to replace calls to
+rem Written by David Charlap (shamino@writeme.com)
+rem
+rem There are two possible problems with this batch file.  The emacs.bat batch
+rem file may not exist in all distributions.  It is part of the GNU build of
+rem Emacs 20.4 (http://www.gnu.org/softare/emacs/windows.ntemacs.html)  If you
+rem install Gnus with some other build, you may have to replace calls to
 rem %1\emacs.bat with something else.
 rem 
-rem Also, the emacs.bat file that Voelker ships does not accept more than 9
+rem Also, the emacs.bat file that comes with Emacs does not accept more than 9
 rem parameters, so the attempts to compile the .texi files will fail.  To
 rem fix that (at least on NT.  I don't know about Win95), the following
 rem change should be made to emacs.bat:
@@ -22,21 +22,47 @@ rem
 rem which will allow the batch file to accept an unlimited number of
 rem parameters.
 
+rem Clear PWD so emacs doesn't get confused
+set GNUS_PWD_SAVE=%PWD%
+set PWD=
+
 if "%1" == "" goto usage
 
+rem Directory where the info files are installed
+set GNUS_INFO_DIR=%1\info
+
+rem Emacs 20.7 no longer includes emacs.bat. Use emacs.exe if the batch file is
+rem not present -- this also fixes the problem about too many parameters on Win9x.
+set emacs=emacs.exe
+if exist %1\bin\emacs.bat set emacs=emacs.bat
+set EMACSBATCH=call %1\bin\%emacs% -no-site-file -batch -q
+
 cd lisp
-call %1\bin\emacs.bat -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
-if not "%2" == "copy" goto info
-copy *.el* %1\lisp
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
+if not "%2" == "/copy" goto info
+attrib -r %1\lisp\gnus\*
+copy *.el* %1\lisp\gnus
 
 :info
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
-call %1\bin\emacs.bat -batch -q -no-site-file gnus.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-call %1\bin\emacs.bat -batch -q -no-site-file message.texi -l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
-if not "%2" == "copy" goto done
-copy gnus %1\info
-copy gnus-?? %1\info
-copy message %1\info
+%EMACSINFO% message.texi
+%EMACSINFO% emacs-mime.texi
+%EMACSINFO% gnus.texi
+if not "%2" == "/copy" goto done
+copy gnus       %GNUS_INFO_DIR%
+copy gnus-?     %GNUS_INFO_DIR%
+copy gnus-??    %GNUS_INFO_DIR%
+copy message    %GNUS_INFO_DIR%
+copy message-?  %GNUS_INFO_DIR%
+copy emacs-mime %GNUS_INFO_DIR%
+copy sieve      %GNUS_INFO_DIR%
+copy pgg        %GNUS_INFO_DIR%
+echo Maybe you should add the following line to %GNUS_INFO_DIR%\dir:
+echo.
+echo * PGG: (pgg).		Emacs interface to various PGP implementations.
+echo * Sieve: (sieve).	Managing Sieve scripts in Emacs.
+echo.
 
 :etc
 cd ..\etc
@@ -47,11 +73,20 @@ cd ..
 goto end
 
 :usage
-echo Usage: make ^<emacs-dir^> [copy]
+echo Usage: make :emacs-dir: [/copy]
 echo.
-echo where: ^<emacs-dir^> is the directory you installed emacs in
-echo                    eg. d:\emacs\19.34
-echo        copy indicates that the compiled files should be copied to your
+echo where: :emacs-dir: is the directory you installed emacs in
+echo                    eg. d:\emacs\20.4
+echo        /copy indicates that the compiled files should be copied to your
 echo             emacs lisp, info, and etc directories
+echo.
+echo Note: If you have Emacs/w3 you should set the environment variable 
+echo       W3DIR to the directory where w3 is installed eg.
+echo                 set W3DIR=d:\lisp\w3-4.0pre46\lisp
 
+rem Restore PWD so whoever called this batch file doesn't get confused
+set PWD=%GNUS_PWD_SAVE%
+set GNUS_PWD_SAVE=
+set EMACSBATCH=
+set GNUS_INFO_DIR=
 :end