X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=make.bat;h=f305b090b09c7f240f075cbeffb5ce81e3e674d4;hp=3b134c538cdba12ff72490b4b322de25137fa7cb;hb=559e4108ff97c334f5affb3519657e73dfe3dad7;hpb=876b5db97b1278f8811220c0b1fbd302630ecf93

diff --git a/make.bat b/make.bat
index 3b134c538..f305b090b 100644
--- a/make.bat
+++ b/make.bat
@@ -1,15 +1,20 @@
-@echo off
+@echo OFF
+REM Change this to ON when debugging this batch file.
 
 rem Written by Frank Schmitt (ich@frank-schmitt.net)
 rem based on the work by David Charlap (shamino@writeme.com)
 rem .
+rem .
 rem Clear PWD so emacs doesn't get confused
 set GNUS_PWD_SAVE=%PWD%
 set PWD=
 set ERROR=:
+REM set pause=
 
-if "%1" == "" goto usage
+if %1p == p goto usage
 
+echo * Installing Gnus on your system.  Operating system:
+ver
 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.
 if exist %1\emacs.bat goto ebat
@@ -21,8 +26,8 @@ goto noemacs
 set EMACS=emacs.bat
 echo.
 echo ***************************************************************************
-echo * Using emacs.bat (If you've got en Emacs >= 20.3 please remove Emacs.bat,
-echo * it isn't needed anymore.
+echo * Using emacs.bat  (If you've got Emacs 20.3 or higher please remove
+echo * Emacs.bat, it isn't needed anymore.)
 echo ***************************************************************************
 echo.
 goto emacs
@@ -68,12 +73,13 @@ echo.
 goto lisp
 
 :lisp
+if "%pause%" == "pause" pause
 set EMACSBATCH=call %1\%EMACS% %EMACS_ARGS%
 cd lisp
-attrib -r gnus-load.el
+if exist gnus-load.el attrib -r gnus-load.el
 if exist gnus-load.el del gnus-load.el
 echo.
-echo Stand by while generating autoloads.
+echo * Stand by while generating autoloads.
 echo.
 %EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-cus-load .
 if ErrorLevel 1 set ERROR=make-cus-load
@@ -82,14 +88,14 @@ if ErrorLevel 1 set ERROR=%ERROR%,make-auto-load
 %EMACSBATCH% -l ./dgnushack.el -f dgnushack-make-load
 if ErrorLevel 1 set ERROR=%ERROR%,make-load
 echo.
-echo Stand by while compiling lisp files.
+echo * Stand by while compiling lisp files.
 echo.
 %EMACSBATCH% -l ./dgnushack.el -f dgnushack-compile
 if ErrorLevel 1 set ERROR=%ERROR%,compile
 
 if not "%2" == "/copy" goto infotest
 echo.
-echo Stand by while copying lisp files.
+echo * Stand by while copying lisp files.
 echo.
 if not exist %GNUS_LISP_DIR%\nul mkdir %GNUS_LISP_DIR%
 xcopy /R /Q /Y *.el* %GNUS_LISP_DIR%
@@ -98,12 +104,13 @@ goto infotest
 
 :infotest
 cd ..\texi
-attrib -r sieve
+if exist sieve attrib -r sieve
 if exist sieve del sieve
 
+echo * Checking if makeinfo is available...
 makeinfo sieve.texi
 if exist sieve goto minfo
-REM It seems that makeinfo isn't available
+echo * No makeinfo found, using infohack.el.
 set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 echo.
 echo ***************************************************************************
@@ -122,8 +129,9 @@ echo.
 goto info
 
 :info
+if "%pause%" == "pause" pause
 echo.
-echo Stand by while generating info files.
+echo * Stand by while generating info files.
 echo.
 %EMACSINFO% emacs-mime.texi
 if ErrorLevel 1 set ERROR=%ERROR%,emacs-mime.texi
@@ -142,7 +150,7 @@ if not "%2" == "/copy" goto nocopy
 if not exist %GNUS_INFO_DIR%\nul mkdir %GNUS_INFO_DIR%
 
 echo.
-echo Stand by while copying info files.
+echo * Stand by while copying info files.
 echo.
 xcopy /R /Q /Y gnus       %GNUS_INFO_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-gnus-info
@@ -176,19 +184,56 @@ echo ***************************************************************************
 echo.
 
 :etc
+if "%pause%" == "pause" pause
 cd ..\etc
 echo.
-echo Stand by while copying etc files.
+echo * Stand by while copying etc files.
 echo.
-if not exist %GNUS_ETC_DIR%\nul mkdir %GNUS_ETC_DIR%
+REM
+if not exist %GNUS_ETC_DIR% mkdir %GNUS_ETC_DIR%
+echo ** gnus-tut.txt ...
 xcopy /R /Q /Y gnus-tut.txt %GNUS_ETC_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-tut-txt
-if not exist %GNUS_ETC_DIR%\gnus\nul mkdir %GNUS_ETC_DIR%\gnus
-xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-gnus-*
-if not exist %GNUS_ETC_DIR%\smilies\nul mkdir %GNUS_ETC_DIR%\smilies
-xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\smilies\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*
+REM
+REM FIXME: Instead of C&P, we should use a FOR loop.
+REM
+set i=images
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=images\mail
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=images\gnus
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=images\smilies
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=images\smilies\grayscale
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=images\smilies\medium
+if not exist %GNUS_ETC_DIR%\%i%\nul mkdir %GNUS_ETC_DIR%\%i%
+echo ** .\%i%\ ...
+xcopy /R /Q /Y .\%i%\*.* %GNUS_ETC_DIR%\%i%\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-%i%
+REM
+set i=
 goto warnings
 
 :nocopy
@@ -266,6 +311,7 @@ goto usage
 :usage
 echo.
 echo ***************************************************************************
+REM echo * Usage: make.bat :[X]Emacs-exe-dir: [/copy] [ ^> inst-log.txt 2^>^&1 ]
 echo * Usage: make.bat :[X]Emacs-exe-dir: [/copy]
 echo *
 echo * where: :[X]Emacs-exe-dir: is the directory your
@@ -274,10 +320,8 @@ echo *           e.g. G:\Programme\XEmacs\XEmacs-21.4.11\i586-pc-win32\
 echo *           or G:\Emacs\bin
 echo *        /copy indicates that the compiled files should be copied to your
 echo *           emacs lisp, info, and etc site 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 echo *        ^> inst-log.txt 2^>^&1
+REM echo *           Log output to inst-log.txt
 echo ***************************************************************************
 echo.
 
@@ -291,7 +335,3 @@ set GNUS_INFO_DIR=
 set GNUS_ETC_DIR=
 set subdirwarning=
 set ERROR=
-
-goto skipArchTag
-   arch-tag: 502dd14c-acde-4f69-8e82-43203b12a82c
-:skipArchTag