[PATCH] Building in a cleaner environment for XEmacs.

[PATCH] Building in a cleaner environment for XEmacs.

[Steve Youngs]

This patch:

        - Sets the command line opts for building with XEmacs to be
          '-batch -no-autoloads...' for a cleaner build environment.

        - Fixes all the byte-compiler warnings that the above
          uncovered. 

        - Sets $datadir to be $prefix/lib in XEmacs instead of
          $prefix/share. 

        - A couple of minor nits in hashcash.el

I'd appreciate it if someone could test this on GNU/Emacs before I
commit this, just to make sure I haven't broken anything there.

Thanks guys!

Gnus patch:
ChangeLog files diff command: cvs -q diff -U 0
Files affected:               lisp/ChangeLog contrib/ChangeLog ChangeLog
Source files diff command:    cvs -q diff -uN
Files affected:               lisp/mailcap.el lisp/lpath.el lisp/dgnushack.el contrib/hashcash.el configure.in aclocal.m4 Makefile.in

Index: ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/ChangeLog,v
retrieving revision 6.48
diff -u -U0 -r6.48 ChangeLog
--- ChangeLog	26 Mar 2003 20:49:55 -0000	6.48
+++ ChangeLog	16 Apr 2003 06:29:34 -0000
@@ -0,0 +1,13 @@
+2003-04-14  Steve Youngs  <youngs@xemacs.org>
+
+	* Makefile.in (XEMACS): Use @EMACS@.
+
+	* aclocal.m4 (AC_PATH_LISPDIR): Set $datadir to $prefix/lib if
+	building with XEmacs.
+
+	* aclocal.m4 (AC_SET_BUILD_FLAGS): New.  So we can set XEmacs
+	command line options to '-batch -no-autoloads...' for a cleaner
+	build environment.
+
+	* configure.in: Use it.
+
@@ -29 +42 @@
-2003-02-13  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
+2003-02-13  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
@@ -72 +85 @@
-2002-12-05  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
+2002-12-05  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
@@ -76 +89 @@
-2002-11-13  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
+2002-11-13  Kai Großjohann  <kai.grossjohann@uni-duisburg.de>
@@ -116 +129 @@
-2001-12-18  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-12-18  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -130 +143 @@
-2001-12-10  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-12-10  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -135 +148 @@
-2001-11-26  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-11-26  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -161 +174 @@
-2001-10-19  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-10-19  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -184 +197 @@
-2001-09-21  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-09-21  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -197 +210 @@
-2001-05-17  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2001-05-17  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/gnus/Makefile.in,v
retrieving revision 6.4
diff -u -u -r6.4 Makefile.in
--- Makefile.in	6 Oct 2001 12:47:45 -0000	6.4
+++ Makefile.in	16 Apr 2003 06:28:22 -0000
@@ -5,7 +5,7 @@
 
 @SET_MAKE@
 EMACS = @EMACS@
-XEMACS = xemacs
+XEMACS = @EMACS@
 
 all: lick info
 
Index: aclocal.m4
===================================================================
RCS file: /usr/local/cvsroot/gnus/aclocal.m4,v
retrieving revision 6.7
diff -u -u -r6.7 aclocal.m4
--- aclocal.m4	27 Apr 2002 17:26:30 -0000	6.7
+++ aclocal.m4	16 Apr 2003 06:28:23 -0000
@@ -84,6 +84,7 @@
 	theprefix=$ac_default_prefix
     fi
     if test "$EMACS_FLAVOR" = "xemacs"; then
+        datadir="\$(prefix)/lib"
         lispdir="\$(datadir)/${EMACS_FLAVOR}/site-packages/lisp/gnus"
     else
     lispdir="\$(datadir)/${EMACS_FLAVOR}/site-lisp"
@@ -138,6 +139,26 @@
   fi
   AC_MSG_RESULT($info_dir)
   AC_SUBST(info_dir)
+])
+
+dnl
+dnl This will set the XEmacs command line options to be slightly different
+dnl from the Emacs ones.  If building with XEmacs the options will be
+dnl "-batch -no-autoloads..." to give a much cleaner build environment.
+dnl
+AC_DEFUN(AC_SET_BUILD_FLAGS, [
+  AC_MSG_CHECKING([which options to pass on to (X)Emacs])
+  if test "x$FLAGS" = "x"; then
+    if test "$EMACS_FLAVOR" = "xemacs"; then
+      FLAGS="-batch -no-autoloads -l \$(srcdir)/dgnushack.el"
+    else
+      FLAGS="-batch -q -no-site-file -l \$(srcdir)/dgnushack.el"
+    fi
+  else
+    FLAGS=$FLAGS
+  fi
+  AC_MSG_RESULT($FLAGS)
+  AC_SUBST(FLAGS)
 ])
 
 dnl
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/gnus/configure.in,v
retrieving revision 6.5
diff -u -u -r6.5 configure.in
--- configure.in	27 Apr 2002 17:26:30 -0000	6.5
+++ configure.in	16 Apr 2003 06:28:23 -0000
@@ -23,6 +23,7 @@
 AC_PATH_INFO_DIR
 AC_CHECK_URL
 AC_CHECK_W3
+AC_SET_BUILD_FLAGS
 GNUS_CHECK_FONTS
 
 AC_OUTPUT(Makefile etc/Makefile lisp/Makefile texi/Makefile texi/gnusconfig.tex texi/ps/Makefile)
Index: contrib/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/contrib/ChangeLog,v
retrieving revision 1.77
diff -u -U0 -r1.77 ChangeLog
--- contrib/ChangeLog	19 Mar 2003 22:23:50 -0000	1.77
+++ contrib/ChangeLog	16 Apr 2003 06:29:40 -0000
@@ -0,0 +1,6 @@
+2003-04-14  Steve Youngs  <youngs@xemacs.org>
+
+	* hashcash.el (hashcash-point-at-bol): Move the fbound test
+	outside of the defalias.
+	(hashcash-point-at-eol): Ditto.
+
@@ -52 +58 @@
-2002-04-24  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+2002-04-24  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
@@ -189 +195 @@
-2000-11-08  Björn Torkelsson  <torkel@hpc2n.umu.se>
+2000-11-08  Björn Torkelsson  <torkel@hpc2n.umu.se>
Index: contrib/hashcash.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/contrib/hashcash.el,v
retrieving revision 1.10
diff -u -u -r1.10 hashcash.el
--- contrib/hashcash.el	11 Mar 2003 21:20:06 -0000	1.10
+++ contrib/hashcash.el	16 Apr 2003 06:28:26 -0000
@@ -60,15 +60,13 @@
 
 (require 'mail-utils)
 
-(defalias 'hashcash-point-at-bol
-    (if (fboundp 'point-at-bol)
-	'point-at-bol
-	'line-beginning-position))
+(if (fboundp 'point-at-bol)
+    (defalias 'hashcash-point-at-bol 'point-at-bol)
+  (defalias 'hashcash-point-at-bol 'line-beginning-position))
 
-(defalias 'hashcash-point-at-eol
-    (if (fboundp 'point-at-eol)
-	'point-at-eol
-	'line-end-position))
+(if (fboundp 'point-at-eol)
+    (defalias 'hashcash-point-at-eol 'point-at-eol)
+  (defalias 'hashcash-point-at-eol 'line-end-position))
 
 (defun hashcash-strip-quoted-names (addr)
   (setq addr (mail-strip-quoted-names addr))
Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 6.2235
diff -u -U0 -r6.2235 ChangeLog
--- lisp/ChangeLog	16 Apr 2003 00:02:03 -0000	6.2235
+++ lisp/ChangeLog	16 Apr 2003 06:30:38 -0000
@@ -0,0 +1,11 @@
+2003-04-14  Steve Youngs  <youngs@xemacs.org>
+
+	* dgnushack.el: Add a whole swag of autoloads and defaliases to
+	satisfy the byte-compiler when building with XEmacs.
+
+	* lpath.el (maybe-bind): Add 'w3-meta-content-type-charset-regexp'
+	and 'w3-meta-charset-content-type-regexp' in XEmacs.  The upstream
+	W3 doesn't have these.
+
+	* mailcap.el: Maybe require 'lpr in XEmacs.
+
Index: lisp/dgnushack.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/dgnushack.el,v
retrieving revision 6.32
diff -u -u -r6.32 dgnushack.el
--- lisp/dgnushack.el	6 Aug 2002 17:57:14 -0000	6.32
+++ lisp/dgnushack.el	16 Apr 2003 06:29:21 -0000
@@ -138,6 +138,53 @@
     (defalias 'x-defined-colors 'ignore)
     (defalias 'read-color 'ignore)))
 
+(eval-and-compile
+  (when (featurep 'xemacs)
+    (autoload 'Info-directory "info" nil t)
+    (autoload 'Info-menu "info" nil t)
+    (autoload 'annotations-at "annotations")
+    (autoload 'apropos "apropos" nil t)
+    (autoload 'apropos-command "apropos" nil t)
+    (autoload 'bbdb-complete-name "bbdb-com" nil t)
+    (autoload 'browse-url "browse-url" nil t)
+    (autoload 'customize-apropos "cus-edit" nil t)
+    (autoload 'customize-save-variable "cus-edit" nil t)
+    (autoload 'customize-variable "cus-edit" nil t)
+    (autoload 'delete-annotation "annotations")
+    (autoload 'dolist "cl-macs" nil nil 'macro)
+    (autoload 'enriched-decode "enriched")
+    (autoload 'info "info" nil t)
+    (autoload 'make-annotation "annotations")
+    (autoload 'make-display-table "disp-table")
+    (autoload 'pp "pp")
+    (autoload 'ps-despool "ps-print" nil t)
+    (autoload 'ps-spool-buffer "ps-print" nil t)
+    (autoload 'ps-spool-buffer-with-faces "ps-print" nil t)
+    (autoload 'read-passwd "passwd")
+    (autoload 'regexp-opt "regexp-opt")
+    (autoload 'reporter-submit-bug-report "reporter")
+    (autoload 'setenv "process" nil t)
+    (autoload 'smtpmail-send-it "smtpmail")
+    (autoload 'sort-numeric-fields "sort" nil t)
+    (autoload 'sort-subr "sort")
+    (autoload 'trace-function-background "trace" nil t)
+    (autoload 'w3-do-setup "w3")
+    (autoload 'w3-prepare-buffer "w3-display")
+    (autoload 'w3-region "w3-display" nil t)
+    (defalias 'frame-char-height 'frame-height)
+    (defalias 'frame-char-width 'frame-width)
+    (defalias 'frame-parameter 'frame-property)
+    (defalias 'make-overlay 'ignore)
+    (defalias 'overlay-end 'ignore)
+    (defalias 'overlay-get 'ignore)
+    (defalias 'overlay-put 'ignore)
+    (defalias 'overlay-start 'ignore)
+    (defalias 'overlays-in 'ignore)
+    (defalias 'replace-dehighlight 'ignore)
+    (defalias 'replace-highlight 'ignore)
+    (defalias 'run-with-idle-timer 'ignore)
+    (defalias 'w3-coding-system-for-mime-charset 'ignore)))
+
 (defun dgnushack-compile (&optional warn)
   ;;(setq byte-compile-dynamic t)
   (unless warn
Index: lisp/lpath.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/lpath.el,v
retrieving revision 6.63
diff -u -u -r6.63 lpath.el
--- lisp/lpath.el	12 Apr 2003 20:30:56 -0000	6.63
+++ lisp/lpath.el	16 Apr 2003 06:29:22 -0000
@@ -52,7 +52,9 @@
 		    enable-multibyte-characters gnus-agent-expire-current-dirs
 		    language-info-alist mark-active mouse-selection-click-count
 		    mouse-selection-click-count-buffer pgg-parse-crc24
-		    temporary-file-directory transient-mark-mode)))
+		    temporary-file-directory transient-mark-mode
+		    w3-meta-content-type-charset-regexp
+		    w3-meta-charset-content-type-regexp)))
   (maybe-fbind '(bbdb-complete-name
 		 delete-annotation device-connection dfw-device
 		 events-to-keys font-lock-set-defaults frame-device
Index: lisp/mailcap.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/mailcap.el,v
retrieving revision 6.17
diff -u -u -r6.17 mailcap.el
--- lisp/mailcap.el	14 Apr 2003 13:37:26 -0000	6.17
+++ lisp/mailcap.el	16 Apr 2003 06:29:26 -0000
@@ -49,6 +49,12 @@
     table)
   "A syntax table for parsing sgml attributes.")
 
+(eval-and-compile
+  (when (featurep 'xemacs)
+    (condition-case nil
+	(require 'lpr)
+      (error nil))))
+
 (defvar mailcap-print-command
   (mapconcat 'identity
 	     (cons (if (boundp 'lpr-command)

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<youngs@xemacs.org>---|

Re: [PATCH] Building in a cleaner environment for XEmacs.

[Frank Schmitt]

Steve Youngs <youngs@xemacs.org> writes:

>         - Sets the command line opts for building with XEmacs to be
>           '-batch -no-autoloads...' for a cleaner build environment.
>         - Sets $datadir to be $prefix/lib in XEmacs instead of
>           $prefix/share. 

Is there anything that should be changed in the XEmacs section of
make.bat?

What it basically does now is

-call XEmacs via C:\Path\to\XEmacs\xemacs.exe -batch -q -no-site-file
-throw info-files in C:\Path\to\XEmacs\\site-packages\info
-throw lisp-files in C:\Path\to\XEmacs\site-packages\lisp\gnus
-throw icons and stuff in C:\Path\to\XEmacs\site-packages\etc\gnus
 respectively C:\Path\to\XEmacs\site-packages\etc\smilies

-- 
"You know the world is going crazy when the best rapper is a white guy,
the best golfer is a black guy, the Swiss hold the America's Cup, France
is accusing the US of arrogance, and Germany doesn't want to go to war."
          -- Unknown author

Re: [PATCH] Building in a cleaner environment for XEmacs.

[Steve Youngs]

|--==> "FS" == Frank Schmitt <usereplyto@Frank-Schmitt.net> writes:

  FS> Steve Youngs <youngs@xemacs.org> writes:
  >>- Sets the command line opts for building with XEmacs to be
  >>'-batch -no-autoloads...' for a cleaner build environment.
  >>- Sets $datadir to be $prefix/lib in XEmacs instead of
  >>$prefix/share. 

  FS> Is there anything that should be changed in the XEmacs section of
  FS> make.bat?

I /think/ it's OK, but it's been an awful long time since I've looked
at a DOS batch file. :-P

  FS> What it basically does now is

  FS> -call XEmacs via C:\Path\to\XEmacs\xemacs.exe -batch -q -no-site-file

Can you change that to 'xemacs.exe -batch -no-autoloads' easily
enough?  Or would it complicate things too much having to do it
differently in the two emacsen?

  FS> -throw info-files in C:\Path\to\XEmacs\\site-packages\info
  FS> -throw lisp-files in C:\Path\to\XEmacs\site-packages\lisp\gnus
  FS> -throw icons and stuff in C:\Path\to\XEmacs\site-packages\etc\gnus
  FS>  respectively C:\Path\to\XEmacs\site-packages\etc\smilies

That all looks fine.

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<youngs@xemacs.org>---|

[Patch] XEmacs args in make.bat (was: [PATCH] Building in a cleaner environment for XEmacs.)

[Frank Schmitt]

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

Steve Youngs <youngs@xemacs.org> writes:

>   FS> -call XEmacs via C:\Path\to\XEmacs\xemacs.exe -batch -q -no-site-file
>
> Can you change that to 'xemacs.exe -batch -no-autoloads' easily
> enough?  Or would it complicate things too much having to do it
> differently in the two emacsen?

This was "Kindergeburtstag" :-)

Could somebody please commit this?


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Changing XEmacs args to -batch -no-autoloads --]
[-- Type: text/x-patch, Size: 998 bytes --]

--- make.bat	2003-04-16 15:51:47.000000000 +0200
+++ make.bat.new	2003-04-16 15:35:38.000000000 +0200
@@ -42,6 +42,7 @@
 if not exist %1\..\site-lisp\gnus 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

 set GNUS_INFO_DIR=%1\..\info

 set GNUS_LISP_DIR=%1\..\site-lisp\gnus\lisp

 set GNUS_ETC_DIR=%1\..\site-lisp\gnus\etc

@@ -55,6 +56,7 @@
 if not exist %1\..\..\site-packages\lisp mkdir %1\..\..\site-packages\lisp

 if not exist %1\..\..\site-packages\etc mkdir %1\..\..\site-packages\etc

 :xemacsnocopy

+set EMACS_ARGS=-batch -no-autoloads

 set GNUS_INFO_DIR=%1\..\..\site-packages\info

 set GNUS_LISP_DIR=%1\..\..\site-packages\lisp\gnus

 set GNUS_ETC_DIR=%1\..\..\site-packages\etc

@@ -66,7 +68,7 @@
 goto lisp

 

 :lisp

-set EMACSBATCH=call %1\%EMACS% -no-site-file -batch -q

+set EMACSBATCH=call %1\%EMACS% %EMACS_ARGS%

 cd lisp

 if exist gnus-load.el del gnus-load.el

 echo.


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



-- 
"You know the world is going crazy when the best rapper is a white guy,
the best golfer is a black guy, the Swiss hold the America's Cup, France
is accusing the US of arrogance, and Germany doesn't want to go to war."
          -- Unknown author

Re: [Patch] XEmacs args in make.bat

[Reiner Steib]

On Wed, Apr 16 2003, Frank Schmitt wrote:

> Could somebody please commit this?

Done.  BTW: Patches with mixed DOS/Unix (or DOS?) line endings don't
make it to the list correctly.  If you attach the patch as
application/octet-stream it should work.

So I applied the changes manually.  Could you please check if it's
correct?  I this ChangeLog entry okay?

	* make.bat: New variable EMACS_ARGS.  Changed XEmacs args.

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

Re: [Patch] XEmacs args in make.bat

[Steve Youngs]

|--==> "FS" == Frank Schmitt <usereplyto@Frank-Schmitt.net> writes:

  FS> Steve Youngs <youngs@xemacs.org> writes:
  FS> -call XEmacs via C:\Path\to\XEmacs\xemacs.exe -batch -q -no-site-file
  >>
  >>Can you change that to 'xemacs.exe -batch -no-autoloads' easily
  >>enough?  Or would it complicate things too much having to do it
  >>differently in the two emacsen?

  FS> This was "Kindergeburtstag" :-)

:-)

Thanks for that, Frank.

I'll apply my patch now.  I haven't heard any bad feedback from Emacs
users, must be OK. :-)  Besides, people using make.bat won't be able
to build Gnus until I do. :-)

-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|            XEmacs - It's not just an editor.             |
|                    It's a way of life.                   |
|------------------------------------<youngs@xemacs.org>---|

Re: [Patch] XEmacs args in make.bat

[Kevin Greiner]

Steve Youngs <youngs@xemacs.org> writes:

> I'll apply my patch now.  I haven't heard any bad feedback from Emacs
> users, must be OK. :-)  Besides, people using make.bat won't be able
> to build Gnus until I do. :-)

The new make.bat worked fine with emacs.  The only issue was that,
when I opened make.bat in emacs, each line was terminated with a pair
of linefeed characters.

I've checked in a change to fix the linefeed characters.

Kevin

Re: [Patch] XEmacs args in make.bat

[Reiner Steib]

On Thu, Apr 17 2003, Kevin Greiner wrote:

> Steve Youngs <youngs@xemacs.org> writes:
>> Besides, people using make.bat won't be able to build Gnus until I
>> do. :-)

Oops, sorry for the too fast commit.

> The new make.bat worked fine with emacs.  The only issue was that,
> when I opened make.bat in emacs, each line was terminated with a pair
> of linefeed characters.

Emacs should be happy with both line terminators.  When editing a DOS
file, Emacs will indicate "(DOS)" in the mode line.

> I've checked in a change to fix the linefeed characters.

I don't use Windows, but I always thought that MS-DOS batch files
*must* have CRLF (\r\n) line terminators not unix-style LF (\n).  I'd
suggest to revert you change, Kevin.

AFAICS, my check-in (revision 6.7) had proper DOS line terminators as
the revisions before (Steve Youngs didn't change make.bat).  

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

Re: [Patch] XEmacs args in make.bat

[Kevin Greiner]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:

> On Thu, Apr 17 2003, Kevin Greiner wrote:
>
>> The new make.bat worked fine with emacs.  The only issue was that,
>> when I opened make.bat in emacs, each line was terminated with a pair
>> of linefeed characters.
>
> Emacs should be happy with both line terminators.  When editing a DOS
> file, Emacs will indicate "(DOS)" in the mode line.
>
>> I've checked in a change to fix the linefeed characters.
>
> I don't use Windows, but I always thought that MS-DOS batch files
> *must* have CRLF (\r\n) line terminators not unix-style LF (\n).  I'd
> suggest to revert you change, Kevin.

Yes, but you don't introduce them literally on a Unix box.  CVS
understands that text files have O/S dependent line terminators so the
\r is added/removed automatically.

If you added \r while on a Unix box, it would explain why I saw \r\r\n
when checking-out the file on windows.

I've been told that earlier versions of the make.bat file were flagged
as binary in CVS.  That would certainly explain the misunderstanding as
binary DOS files would appear in DOS mode on a Unix box.  Personally,
while I didn't make the change, I prefer having a text file marked as
text in CVS.


Kevin

\r\n or \n line endings in make.bat? (was: [Patch] XEmacs args in make.bat)

[Reiner Steib]

On Fri, Apr 18 2003, Kevin Greiner wrote:

> Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
>> On Thu, Apr 17 2003, Kevin Greiner wrote:
[...]
>>> I've checked in a change to fix the linefeed characters.
>>
>> I don't use Windows, but I always thought that MS-DOS batch files
>> *must* have CRLF (\r\n) line terminators not unix-style LF (\n).  I'd
>> suggest to revert you change, Kevin.
>
> Yes, but you don't introduce them literally on a Unix box.  CVS
> understands that text files have O/S dependent line terminators so the
> \r is added/removed automatically.
>
> If you added \r while on a Unix box, 

I didn't introduce them, they were there already.

> it would explain why I saw \r\r\n when checking-out the file on
> windows.
>
> I've been told that earlier versions of the make.bat file were flagged
> as binary in CVS.  That would certainly explain the misunderstanding as
> binary DOS files would appear in DOS mode on a Unix box.  Personally,
> while I didn't make the change, I prefer having a text file marked as
> text in CVS.

I don't have any personal preferences about this, as I don't use
windows.  What happens if Lars builds the nightly snapshot *.tar.gz or
a release on his Unix box with make.bat included with Unix line
terminators?  Will a windows user be able to execute make.bat
successfully?

The old make.bat and make-x.bat had DOS-line endings on my unix boxes
as well.  So I _guess_ that make.bat should be checked out with DOS
line terminators everywhere, i.e. to my knowledge it should be flagged
as binary in CVS (but I'm not sure).

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

Re: \r\n or \n line endings in make.bat?

[Graham Murray]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:

> What happens if Lars builds the nightly snapshot *.tar.gz or a
> release on his Unix box with make.bat included with Unix line
> terminators?  Will a windows user be able to execute make.bat
> successfully?

Windows should have no problem with unix line endings in make.bat

Re: \r\n or \n line endings in make.bat?

[Frank Schmitt]

Graham Murray <graham@gmurray.org.uk> writes:

> Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
>
>> What happens if Lars builds the nightly snapshot *.tar.gz or a
>> release on his Unix box with make.bat included with Unix line
>> terminators?  Will a windows user be able to execute make.bat
>> successfully?
>
> Windows should have no problem with unix line endings in make.bat

Just tested it and it has problems. (It just doesn't work, because the
interpreter of Win 9x, command.com, thinks the file is one long line).

Make.bat _must_ be dos mode, and I'd also vote for flagging it binary.

-- 
"You know the world is going crazy when the best rapper is a white guy,
the best golfer is a black guy, the Swiss hold the America's Cup, France
is accusing the US of arrogance, and Germany doesn't want to go to war."
          -- Unknown author

Re: \r\n or \n line endings in make.bat?

[Kevin Greiner]

Frank Schmitt <usereplyto@Frank-Schmitt.net> writes:

> Graham Murray <graham@gmurray.org.uk> writes:
>
>> Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
>>
>>> What happens if Lars builds the nightly snapshot *.tar.gz or a
>>> release on his Unix box with make.bat included with Unix line
>>> terminators?  Will a windows user be able to execute make.bat
>>> successfully?
>>
>> Windows should have no problem with unix line endings in make.bat
>
> Just tested it and it has problems. (It just doesn't work, because the
> interpreter of Win 9x, command.com, thinks the file is one long line).
>
> Make.bat _must_ be dos mode, and I'd also vote for flagging it binary.

Reiner makes an excellent point that make.bat has to always have DOS
terminators so that distributions built on Unix will work right on
WinX.  My concern was that I've run into more than one file with
newlines applied inconsistently.  Still, it appears that flagging
make.bat as binary appears best.

We'll have to simply be diligent about correcting any errors that
creep in.

Kevin

Re: \r\n or \n line endings in make.bat?

[Reiner Steib]

On Sun, Apr 20 2003, Kevin Greiner wrote:

> Frank Schmitt <usereplyto@Frank-Schmitt.net> writes:
>> Graham Murray <graham@gmurray.org.uk> writes:
>>> Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:
>>>
>>>> What happens if Lars builds the nightly snapshot *.tar.gz or a
>>>> release on his Unix box with make.bat included with Unix line
>>>> terminators?  Will a windows user be able to execute make.bat
>>>> successfully?
>>>
>>> Windows should have no problem with unix line endings in make.bat

Probably you tried with cmd.exe (or however it's called) and not with
command.com.

>> Just tested it and it has problems. (It just doesn't work, because the
>> interpreter of Win 9x, command.com, thinks the file is one long line).
>> Make.bat _must_ be dos mode, and I'd also vote for flagging it binary.

[X] Done.

JFTR, this is what I did (I hope it's correct):

- $ cvs admin -kb make.bat
  $ cvs update -A make.bat

- Convert to DOS line terminators

- Do some (whitespace) changes (else CVS doesn't notice the change).

- Commit the file.

Frank, could you verify if it works for Win 9x (command.com) again?

> My concern was that I've run into more than one file with newlines
> applied inconsistently. [...]  We'll have to simply be diligent
> about correcting any errors that creep in.

When flagged as binary, Emacs should treat it as a DOS file and insert
the appropriate line terminators.

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

Re: \r\n or \n line endings in make.bat?

[Kevin Greiner]

Reiner Steib <4.uce.03.r.s@nurfuerspam.de> writes:

> - $ cvs admin -kb make.bat
>   $ cvs update -A make.bat
>
> - Convert to DOS line terminators
>
> - Do some (whitespace) changes (else CVS doesn't notice the change).
>
> - Commit the file.
>
> Frank, could you verify if it works for Win 9x (command.com) again?

I also works for me on WinXP.

Kevin

Re: [PATCH] Building in a cleaner environment for XEmacs.

[Katsumi Yamaoka]

Hi,

I'm sorry for missing your message.  I've fixed the ChangeLog
files to respect the coding cookie:

;; Local Variables:
;; coding: iso-2022-7bit
;; End:

>>>>> In <microsoft-free.87fzojymmr.fsf@eicq.dnsalias.org>
>>>>>	Steve Youngs <youngs@xemacs.org> wrote:

SY> This patch:

SY>         - Sets the command line opts for building with XEmacs to be
SY>           '-batch -no-autoloads...' for a cleaner build environment.

SY>         - Fixes all the byte-compiler warnings that the above
SY>           uncovered. 

Is the lpath.el file useless for that purpose?  In addition, the
following line is mismatched for XEmacs 21.4.

SY> +    (autoload 'setenv "process" nil t)

Regards,
-- 
Katsumi Yamaoka <yamaoka@jpl.org>

Re: [PATCH] Building in a cleaner environment for XEmacs.

[Steve Youngs]

|--==> "KY" == Katsumi Yamaoka <yamaoka@jpl.org> writes:

  KY> I'm sorry for missing your message.  I've fixed the ChangeLog
  KY> files to respect the coding cookie:

  KY> ;; Local Variables:
  KY> ;; coding: iso-2022-7bit
  KY> ;; End:

Thanks for that.  The Gnus ChangeLogs give me lots of trouble, XEmacs
doesn't yet support coding cookies in local variables.  At least
that's what XEmacs told me.

  >>>>>>In <microsoft-free.87fzojymmr.fsf@eicq.dnsalias.org>
  >>>>>>Steve Youngs <youngs@xemacs.org> wrote:

  SY> - Fixes all the byte-compiler warnings that the above
  SY> uncovered. 

  KY> Is the lpath.el file useless for that purpose?  

From what I could see, lpath.el is more for hiding/ignoring warnings
and errors.  I didn't want to do that, I wanted to address all the
warnings properly if possible.

  KY> In addition, the following line is mismatched for XEmacs 21.4.

  SY> +    (autoload 'setenv "process" nil t)

Ah!  It's in process.el in 21.5, but env.el in 21.4 and below.  I'll
fix it up straight away.

BTW, what do I need to do to prevent screwing up the ChangeLog again?




-- 
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
|        XEmacs - The only _______ you'll ever need.       |
|          Fill in the blank, yes, it's THAT good!         |
|------------------------------------<youngs@xemacs.org>---|

Re: [PATCH] Building in a cleaner environment for XEmacs.

[Katsumi Yamaoka]

>>>>> In <microsoft-free.87k7dtva79.fsf@eicq.dnsalias.org>
>>>>>	Steve Youngs <youngs@xemacs.org> wrote:

KY> Is the lpath.el file useless for that purpose?

SY> >From what I could see, lpath.el is more for hiding/ignoring warnings
SY> and errors.  I didn't want to do that, I wanted to address all the
SY> warnings properly if possible.

I feel those effects are the same, except that it is good to
indicate the sources of the hidden features using autoload.
I probably need to try ``xemacs -batch -no-autoloads...'' by
myself. :)

SY> BTW, what do I need to do to prevent screwing up the ChangeLog again?

I'm using binary (C-u C-x C-f FILENAME RET binary RET) and the
following hook function for those files since I have no need to
edit Latin names. :-p

(setq revert-buffer-insert-file-contents-function
      ;; written by IKEYAMA Tomonori -san in the xemacs-users-ja list.
      (lambda (file-name auto-save-p)
	(if (not (file-exists-p file-name))
	    (error "File %s no longer exists!" file-name))
	(let ((buffer-file-name nil))
	  (or auto-save-p
	      (unlock-buffer)))
	(widen)
	(let ((coding-system-for-read buffer-file-coding-system))
	  (insert-file-contents file-name (not auto-save-p) nil nil t))))
-- 
Katsumi Yamaoka <yamaoka@jpl.org>