X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=make.bat;h=672284b6a350e65c043ccdfd02e510104006012e;hb=fca66dcf24100d1333b01882d03528b3519d5f33;hp=e65a629db04e7049fc8590641955670b56dbf338;hpb=e097a04d643250ca7acdb6cee2718d265c5c32bf;p=gnus

diff --git a/make.bat b/make.bat
index e65a629db..672284b6a 100644
--- a/make.bat
+++ b/make.bat
@@ -1,6 +1,6 @@
 @echo off
 
-rem Written by Frank Schmitt <ich@frank-schmitt.net>
+rem Written by Frank Schmitt (ich@frank-schmitt.net)
 rem based on the work by David Charlap (shamino@writeme.com)
 rem .
 rem Clear PWD so emacs doesn't get confused
@@ -21,7 +21,7 @@ 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 * Using emacs.bat (If you've got en Emacs >= 20.3 please remove Emacs.bat,
 echo * it isn't needed anymore.
 echo ***************************************************************************
 echo.
@@ -38,8 +38,8 @@ goto emacs
 
 :emacs
 if not "%2" == "/copy" goto emacsnocopy
-if not exist %1\..\site-lisp mkdir %1\..\site-lisp
-if not exist %1\..\site-lisp\gnus mkdir %1\..\site-lisp\gnus
+if not exist %1\..\site-lisp\nul mkdir %1\..\site-lisp
+if not exist %1\..\site-lisp\gnus\nul mkdir %1\..\site-lisp\gnus
 if not exist %1\..\site-lisp\subdirs.el set subdirwarning=yes
 :emacsnocopy
 set EMACS_ARGS=-batch -q -no-site-file
@@ -47,14 +47,14 @@ set GNUS_INFO_DIR=%1\..\info
 set GNUS_LISP_DIR=%1\..\site-lisp\gnus\lisp
 set GNUS_ETC_DIR=%1\..\site-lisp\gnus\etc
 goto lisp
-      
-:xemacs      
+
+:xemacs
 set EMACS=xemacs.exe
 if not "%2" == "/copy" goto xemacsnocopy
-if not exist %1\..\..\site-packages\ mkdir %1\..\..\site-packages\
-if not exist %1\..\..\site-packages\info mkdir %1\..\..\site-packages\info
-if not exist %1\..\..\site-packages\lisp mkdir %1\..\..\site-packages\lisp
-if not exist %1\..\..\site-packages\etc mkdir %1\..\..\site-packages\etc
+if not exist %1\..\..\site-packages\nul mkdir %1\..\..\site-packages\
+if not exist %1\..\..\site-packages\info\nul mkdir %1\..\..\site-packages\info
+if not exist %1\..\..\site-packages\lisp\nul mkdir %1\..\..\site-packages\lisp
+if not exist %1\..\..\site-packages\etc\nul mkdir %1\..\..\site-packages\etc
 :xemacsnocopy
 set EMACS_ARGS=-batch -no-autoloads
 set GNUS_INFO_DIR=%1\..\..\site-packages\info
@@ -70,6 +70,7 @@ goto lisp
 :lisp
 set EMACSBATCH=call %1\%EMACS% %EMACS_ARGS%
 cd lisp
+attrib -r gnus-load.el
 if exist gnus-load.el del gnus-load.el
 echo.
 echo Stand by while generating autoloads.
@@ -90,16 +91,18 @@ if not "%2" == "/copy" goto infotest
 echo.
 echo Stand by while copying lisp files.
 echo.
-if not exist %GNUS_LISP_DIR% mkdir %GNUS_LISP_DIR%
+if not exist %GNUS_LISP_DIR%\nul mkdir %GNUS_LISP_DIR%
 xcopy /R /Q /Y *.el* %GNUS_LISP_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-lisp
 goto infotest
 
 :infotest
 cd ..\texi
+attrib -r sieve
 if exist sieve del sieve
+
 makeinfo sieve.texi
-if exist sieve goto minfo 
+if exist sieve goto minfo
 REM It seems that makeinfo isn't available
 set EMACSINFO=%EMACSBATCH% -l infohack.el -f batch-makeinfo
 echo.
@@ -110,7 +113,7 @@ echo.
 goto info
 
 :minfo
-set EMACSINFO=makeinfo  
+set EMACSINFO=makeinfo
 echo.
 echo ***************************************************************************
 echo * Using makeinfo
@@ -132,9 +135,11 @@ if ErrorLevel 1 set ERROR=%ERROR%,sieve.texi
 if ErrorLevel 1 set ERROR=%ERROR%,pgg.texi
 %EMACSINFO% message.texi
 if ErrorLevel 1 set ERROR=%ERROR%,message.texi
+%EMACSINFO% sasl.texi
+if ErrorLevel 1 set ERROR=%ERROR%,sasl.texi
 
 if not "%2" == "/copy" goto nocopy
-if not exist %GNUS_INFO_DIR% mkdir %GNUS_INFO_DIR%
+if not exist %GNUS_INFO_DIR%\nul mkdir %GNUS_INFO_DIR%
 
 echo.
 echo Stand by while copying info files.
@@ -155,15 +160,18 @@ xcopy /R /Q /Y sieve      %GNUS_INFO_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-sieve-info
 xcopy /R /Q /Y pgg        %GNUS_INFO_DIR%
 if ErrorLevel 1 set ERROR=%ERROR%,copy-pgg-info
+xcopy /R /Q /Y sasl        %GNUS_INFO_DIR%
+if ErrorLevel 1 set ERROR=%ERROR%,copy-sasl-info
 
 echo.
 echo ***************************************************************************
-echo * You should add the following lines to 
-echo * %GNUS_INFO_DIR%\dir 
+echo * You should add the following lines to
+echo * %GNUS_INFO_DIR%\dir
 echo * if they aren't already there:
 echo *
 echo * * PGG: (pgg).	Emacs interface to various PGP implementations.
 echo * * Sieve: (sieve).	Managing Sieve scripts in Emacs.
+echo * * SASL: (sasl).	The Emacs SASL library.
 echo ***************************************************************************
 echo.
 
@@ -172,27 +180,31 @@ cd ..\etc
 echo.
 echo Stand by while copying etc files.
 echo.
-if not exist %GNUS_ETC_DIR% mkdir %GNUS_ETC_DIR%
+if not exist %GNUS_ETC_DIR%\nul mkdir %GNUS_ETC_DIR%
 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 mkdir %GNUS_ETC_DIR%\gnus
+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 mkdir %GNUS_ETC_DIR%\smilies
-xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\smilies\
-if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*
+if not exist %GNUS_ETC_DIR%\images\nul mkdir %GNUS_ETC_DIR%\images
+if not exist %GNUS_ETC_DIR%\images\gnus\nul mkdir %GNUS_ETC_DIR%\images\gnus
+xcopy /R /Q /Y .\images\gnus\* %GNUS_ETC_DIR%\images\gnus\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-gnus-*
+if not exist %GNUS_ETC_DIR%\images\smilies\nul mkdir %GNUS_ETC_DIR%\images\smilies
+xcopy /R /Q /Y .\images\smilies\* %GNUS_ETC_DIR%\images\smilies\
+if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-images-smilies-*
 goto warnings
 
 :nocopy
 echo.
 echo ***************************************************************************
-echo * You chose not to copy the files, therefore you should add the 
+echo * You chose not to copy the files, therefore you should add the
 echo * following lines to the TOP of your [X]emacs customization file:
 echo *
 echo * (add-to-list 'load-path "/Path/to/gnus/lisp")
 echo * (if (featurep 'xemacs)
 echo *     (add-to-list 'Info-directory-list "c:/Path/to/gnus/texi/")
-echo *   (add-to-list 'Info-default-directory-list "c:/Path/to/gnus/texi/")
+echo *   (add-to-list 'Info-default-directory-list "c:/Path/to/gnus/texi/"))
 echo * (require 'gnus-load)
 echo *
 echo * Replace c:/Path/to/gnus with the Path where your new Gnus is (that's here
@@ -260,14 +272,14 @@ echo.
 echo ***************************************************************************
 echo * Usage: make.bat :[X]Emacs-exe-dir: [/copy]
 echo *
-echo * where: :[X]Emacs-exe-dir: is the directory your 
-echo *           emacs.exe respectively xemacs.exe resides in, 
+echo * where: :[X]Emacs-exe-dir: is the directory your
+echo *           emacs.exe respectively xemacs.exe resides in,
 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 * 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
 echo ***************************************************************************
@@ -283,3 +295,7 @@ set GNUS_INFO_DIR=
 set GNUS_ETC_DIR=
 set subdirwarning=
 set ERROR=
+
+goto skipArchTag
+   arch-tag: 502dd14c-acde-4f69-8e82-43203b12a82c
+:skipArchTag