Re: Gnus 5.11 in Emacs CVS

[Reiner Steib <4.uce.03.r.s@nurfuerspam.de>]

On Thu, Jan 08 2004, Reiner Steib wrote:

> On Tue, Jan 06 2004, Lars Magne Ingebrigtsen wrote:
[ Including Gnus 5.11 in Emacs CVS ]
>> Some kind soul takes it upon him- or herself to start merging Gnus
>> into Emacs.  This is quite a bit of work.  
>
> Naively, I would have though that it's more or less placing
> [gnus/]lisp files in [emacs]/lisp/gnus and [gnus/]texi in [emacs/]man.

I gave it a try and it seems to work nicely.  I wrote down the
necessary steps as a shell script (see below), that should be run in
directory "emacs/" of an Emacs check-out before "make bootstrap".
Maybe someone wants to test it too.

Some minor problems (see the comments about "load-path shadows" in the
script):

# Not needed for GNU Emacs (XEmacs compatibility library)
  $rm gnus/gnus-xmas.el{,c}

# Gnus can use the file from calendar/ instead:
  $rm gnus/parse-time.el{,c}

# Gnus can use the file from net/ instead:
  $rm gnus/netrc.el{,c}

The following items should probably be discussed on emacs-devel:

# We should probably move gnus/tls.el to net/
  $rm net/tls.el{,c}

# The version from calendar/ lacks `time-to-number-of-days'
  $rm calendar/time-date.el{,c}

Other items: 

- What about GNUS-NEWS -> etc/NEWS?  Where to put the Gnus items?
  `**' has to be replaced by `***'.  Should the item about "make.bat"
  be removed (it doesn't make sense for the bundled Gnus, I suppose)?

- What about the arch-tags in Emacs CVS?  Probably we should ask Miles
  Bader (who added them) for advice (on emacs-devel)?

I still would like to hear comments on the following:

> Could someone who did (or helped with) the previous merge (Gnus 5.9 in
> Emacs 21) tell a little more about it?  Possible problems, pitfalls,
> etc.?
>
> What about all the changes made to Gnus 5.8.8/5.9 [1] in Emacs' CVS?
> Probably the changes committed by Dave Love, Jesper Harder, ShengHuo
> ZHU or other developers with write access to Gnus' CVS were also
> applied to (or synced with) Gnus' CVS.  I didn't check, though.
[...]
> [1] It's not clear to me from the ChangeLog (in Emacs CVS), when this
>     merge happened.

Bye, Reiner.

--8<---------------cut here---------------start------------->8---
#!/usr/bin/env bash
# With GNU cp, rm, ...
: ${rm:="rm -v"}
: ${cp:="cp -vp"}

old_pwd=`pwd`

# Base directory of your unpacked Gnus 5.10.6 source tarball
# (must have the subdirs etc/, lisp/ and texi/):
: ${Oort_base:="$HOME/src/links/Emacs/gnus/5.10/gnus-5.10.6"}

dirs_to_check="$Oort_base/texi
               $Oort_base/etc
	       $Oort_base/lisp
	       lisp/gnus
	       man"

for i in $dirs_to_check; do     
  [ -d "$i" ] || {
    echo "'$i' is not a directory."
    echo "Is '$old_pwd' (pwd)"
    echo "really the base directory of your emacs checkout"
    echo "and is '$Oort_base' the correct Gnus 5.10.6 directory?"
    exit 1
  } >&2
done

manuals="emacs-mime.texi gnus-faq.texi gnus.texi message.texi
         pgg.texi sieve.texi"

(
  echo "Setting up 'man'..." >&2
  cd man
  echo "Removing old *.texi files..." >&2
  for i in $manuals; do
    $rm $i
    $cp $Oort_base/texi/$i $i
  done
)

(
  echo "Setting up 'lisp/gnus'..." >&2
  cd lisp/gnus
  echo "Removing old *.el and *.?pm files..." >&2
  $rm *.el *.elc *.?pm
  echo "New pixmaps..."  >&2
  $cp $Oort_base/etc/{smilies,gnus}/*.?pm .
  echo "New lisp files..."  >&2
  $cp $Oort_base/lisp/*.el .
)

(
  cd lisp
  diff_files="net/tls.el gnus/tls.el
              net/netrc.el gnus/netrc.el
              calendar/time-date.el gnus/time-date.el"
  
  (
    set -- $diff_files
    while [ $# -ge 2 ]; do
      diff -u $1 $2
      shift 2
    done > $old_pwd/Gnus-5-11.patch
  )

  (
    set -- $diff_files
    while [ $# -ge 2 ]; do
      diff -wu $1 $2
      shift 2
    done > $old_pwd/Gnus-5-11.no-ws.patch
  )

# Make sure that we don't have any load-path shadows:

  echo "removing some files.." >&2
# Not needed for GNU Emacs (XEmacs compatibility library)
  $rm gnus/gnus-xmas.el{,c}

# Gnus can use the file from calendar/ instead:
  $rm gnus/parse-time.el{,c}
# Gnus can use the file from net/ instead:
  $rm gnus/netrc.el{,c}

# The following should probably be discussed on emacs-devel:

# We should probably move gnus/tls.el to net/
  $rm net/tls.el{,c}
# The version from calendar/ lacks some function
  $rm calendar/time-date.el{,c}
)

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