Gnus development mailing list
 help / color / mirror / Atom feed
* [Patch] make.bat and make-x.bat
@ 2003-01-10 19:45 Reiner Steib
  2003-01-11 21:07 ` Lars Magne Ingebrigtsen
  0 siblings, 1 reply; 4+ messages in thread
From: Reiner Steib @ 2003-01-10 19:45 UTC (permalink / raw)


[-- Attachment #1: Type: text/plain, Size: 650 bytes --]

Hi,

AFAICS, the make*.bat files didn't install some of the info files
correctly.

--8<---------------cut here---------------start------------->8---
2003-01-10  Reiner Steib  <Reiner.Steib@gmx.de>

	* make.bat: Removed "-no-init-file" (it's the same as "-q").  Use
	new variables EMACSBATCH and GNUS_INFO_DIR.  Install gnus-?,
	message-?, sieve and pgg (in texi).  Added hint for dir entries.

	* make-x.bat: Ditto.

--8<---------------cut here---------------end--------------->8---

I have tested the patch on an old WinNT 4.0 installation in VMware
with GNU Emacs 21.2.  I didn't test make-x.bat.  It would be nice if
Windows users could test it.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: make.bat.info.patch --]
[-- Type: text/x-patch, Size: 3600 bytes --]

--- make.bat	2001/09/21 09:59:49	6.4
+++ make.bat	2003/01/10 19:36:39
@@ -28,28 +28,41 @@
 
 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% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
+%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=call %1\bin\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
 %EMACSINFO% message.texi
 %EMACSINFO% emacs-mime.texi
 %EMACSINFO% gnus.texi
 if not "%2" == "/copy" goto done
-copy gnus %1\info
-copy gnus-?? %1\info
-copy message %1\info
-copy emacs-mime %1\info
+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
@@ -74,4 +87,6 @@
 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
--- make-x.bat	2001/12/18 10:39:18	6.6
+++ make-x.bat	2003/01/10 19:36:39
@@ -10,28 +10,42 @@
 
 if "%1" == "" goto usage
 
+rem Directory where the info files are installed
+set GNUS_INFO_DIR=%1\..\..\xemacs-packages\info
+
 set emacs=xemacs.exe
 if "%2" == "" set copy="false"
 if "%2" == "copy" set copy=true
 if "%2" == "/copy" set copy=true
 
+set EMACSBATCH=call %1\%emacs% -batch -q -no-site-file
+
 cd lisp
-call %1\%emacs% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
 if not %copy%==true goto info
 attrib -r %1\..\..\xemacs-packages\lisp\gnus\*.*
 copy *.el? %1\..\..\xemacs-packages\lisp\gnus
 
 :info
-set EMACSINFO=call %1\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
 %EMACSINFO% message.texi
 %EMACSINFO% emacs-mime.texi
 %EMACSINFO% gnus.texi
 if not %copy%==true goto done
-copy gnus %1\..\..\xemacs-packages\info
-copy gnus-?? %1\..\..\xemacs-packages\info
-copy message %1\..\..\xemacs-packages\info
-copy emacs-mime %1\..\..\xemacs-packages\info
+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
@@ -57,4 +71,6 @@
 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

[-- Attachment #3: Type: text/plain, Size: 116 bytes --]


Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo--- PGP key available via WWW   http://rsteib.home.pages.de/

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch] make.bat and make-x.bat
  2003-01-10 19:45 [Patch] make.bat and make-x.bat Reiner Steib
@ 2003-01-11 21:07 ` Lars Magne Ingebrigtsen
  2003-01-13 11:25   ` Reiner Steib
  0 siblings, 1 reply; 4+ messages in thread
From: Lars Magne Ingebrigtsen @ 2003-01-11 21:07 UTC (permalink / raw)


Reiner Steib <4uce.02.r.steib@gmx.net> writes:

> 	* make.bat: Removed "-no-init-file" (it's the same as "-q").  Use
> 	new variables EMACSBATCH and GNUS_INFO_DIR.  Install gnus-?,
> 	message-?, sieve and pgg (in texi).  Added hint for dir entries.
>
> 	* make-x.bat: Ditto.

Hm...  The patch didn't apply.  Could you send me a new patch?

-- 
(domestic pets only, the antidote for overdose, milk.)
   larsi@gnus.org * Lars Magne Ingebrigtsen



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch] make.bat and make-x.bat
  2003-01-11 21:07 ` Lars Magne Ingebrigtsen
@ 2003-01-13 11:25   ` Reiner Steib
  2003-01-13 18:34     ` Lars Magne Ingebrigtsen
  0 siblings, 1 reply; 4+ messages in thread
From: Reiner Steib @ 2003-01-13 11:25 UTC (permalink / raw)


[-- Attachment #1: Type: text/plain, Size: 578 bytes --]

On Sat, Jan 11 2003, Lars Magne Ingebrigtsen wrote:

> Reiner Steib <4uce.02.r.steib@gmx.net> writes:
>
>> 	* make.bat: Removed "-no-init-file" (it's the same as "-q").  Use
>> 	new variables EMACSBATCH and GNUS_INFO_DIR.  Install gnus-?,
>> 	message-?, sieve and pgg (in texi).  Added hint for dir entries.
>>
>> 	* make-x.bat: Ditto.
>
> Hm...  The patch didn't apply.  Could you send me a new patch?

The patch output contained mixed line terminators [1], whereas the
attachment had Unix (LF) line terminators.

Here's the same attachment using "application/octet-stream"...

[-- Attachment #2: make.bat.info.patch --]
[-- Type: application/octet-stream, Size: 3707 bytes --]

--- make.bat	2001/09/21 09:59:49	6.4
+++ make.bat	2003/01/10 19:36:39
@@ -28,28 +28,41 @@
 
 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% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
+%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=call %1\bin\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
 %EMACSINFO% message.texi
 %EMACSINFO% emacs-mime.texi
 %EMACSINFO% gnus.texi
 if not "%2" == "/copy" goto done
-copy gnus %1\info
-copy gnus-?? %1\info
-copy message %1\info
-copy emacs-mime %1\info
+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
@@ -74,4 +87,6 @@
 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
--- make-x.bat	2001/12/18 10:39:18	6.6
+++ make-x.bat	2003/01/10 19:36:39
@@ -10,28 +10,42 @@
 
 if "%1" == "" goto usage
 
+rem Directory where the info files are installed
+set GNUS_INFO_DIR=%1\..\..\xemacs-packages\info
+
 set emacs=xemacs.exe
 if "%2" == "" set copy="false"
 if "%2" == "copy" set copy=true
 if "%2" == "/copy" set copy=true
 
+set EMACSBATCH=call %1\%emacs% -batch -q -no-site-file
+
 cd lisp
-call %1\%emacs% -batch -q -no-site-file -l ./dgnushack.el -f dgnushack-compile
+%EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
 if not %copy%==true goto info
 attrib -r %1\..\..\xemacs-packages\lisp\gnus\*.*
 copy *.el? %1\..\..\xemacs-packages\lisp\gnus
 
 :info
-set EMACSINFO=call %1\%emacs% -no-site-file -no-init-file -batch -q -l infohack.el -f batch-makeinfo
+set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 cd ..\texi
 %EMACSINFO% message.texi
 %EMACSINFO% emacs-mime.texi
 %EMACSINFO% gnus.texi
 if not %copy%==true goto done
-copy gnus %1\..\..\xemacs-packages\info
-copy gnus-?? %1\..\..\xemacs-packages\info
-copy message %1\..\..\xemacs-packages\info
-copy emacs-mime %1\..\..\xemacs-packages\info
+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
@@ -57,4 +71,6 @@
 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

[-- Attachment #3: Type: text/plain, Size: 275 bytes --]


Bye, Reiner.

[1]
$ cvs dif -u make.bat make-x.bat > make.bat.info.patch
$ file make.bat.info.patch
make.bat.info.patch: ASCII English text, with CRLF, LF line terminators
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo--- PGP key available via WWW   http://rsteib.home.pages.de/

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Patch] make.bat and make-x.bat
  2003-01-13 11:25   ` Reiner Steib
@ 2003-01-13 18:34     ` Lars Magne Ingebrigtsen
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Magne Ingebrigtsen @ 2003-01-13 18:34 UTC (permalink / raw)


Reiner Steib <4uce.02.r.steib@gmx.net> writes:

> Here's the same attachment using "application/octet-stream"...

Thanks for the patch; I've applied it to Oort Gnus v0.13 (i. e., CVS).

-- 
(domestic pets only, the antidote for overdose, milk.)
   larsi@gnus.org * Lars Magne Ingebrigtsen




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2003-01-13 18:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-01-10 19:45 [Patch] make.bat and make-x.bat Reiner Steib
2003-01-11 21:07 ` Lars Magne Ingebrigtsen
2003-01-13 11:25   ` Reiner Steib
2003-01-13 18:34     ` Lars Magne Ingebrigtsen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).