* Image location in standalone Gnus
@ 2005-02-17 5:23 Miles Bader
2005-02-17 14:48 ` Reiner Steib
0 siblings, 1 reply; 7+ messages in thread
From: Miles Bader @ 2005-02-17 5:23 UTC (permalink / raw)
I recently (after much procrastination :-) applied Reiner's patch to the
Emacs sources to move the location of Gnus image files to
.../etc/images/{gnus,smilies}.
Should I propagate this change to Gnus standalone? Standalone Gnus
already uses a somewhat similar structure, but omits the
".../images/..." intermediate directory level. It seems cleaner with
"images", but Reiner said some Makefile hacking would be required.
Thanks,
-Miles
--
I'd rather be consing.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-17 5:23 Image location in standalone Gnus Miles Bader
@ 2005-02-17 14:48 ` Reiner Steib
2005-02-17 17:50 ` Reiner Steib
0 siblings, 1 reply; 7+ messages in thread
From: Reiner Steib @ 2005-02-17 14:48 UTC (permalink / raw)
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
On Thu, Feb 17 2005, Miles Bader wrote:
> I recently (after much procrastination :-) applied Reiner's patch to the
> Emacs sources to move the location of Gnus image files to
> .../etc/images/{gnus,smilies}.
>
> Should I propagate this change to Gnus standalone?
As this would minimize the changes in the Lisp files, I'd vote for
including this to the trunk and to the v5-10 branch.
> Standalone Gnus already uses a somewhat similar structure, but omits
> the ".../images/..." intermediate directory level. It seems cleaner
> with "images", but Reiner said some Makefile hacking would be
> required.
I think we'd only have to replace...
$(etcdir)/smilies by $(etcdir)/images/smilies
$(etcdir)/$$p by $(etcdir)/images/$$p
... in `etc/Makefile.in'. Then "make install" will do the right
thing. In fact Lars recommends _not_ to use "make install" in the
README[1,2] file of the standalone Gnus distribution. With a little
modification of the "all" target in ./Makfile.in and etc/Makefile.in
we can deal with that, I think:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: make-etc-images.patch --]
[-- Type: text/x-patch, Size: 3550 bytes --]
Index: Makefile.in
===================================================================
RCS file: /usr/local/cvsroot/gnus/Makefile.in,v
retrieving revision 6.5.2.2
diff -u -r6.5.2.2 Makefile.in
--- Makefile.in 20 May 2004 21:21:53 -0000 6.5.2.2
+++ Makefile.in 17 Feb 2005 14:32:35 -0000
@@ -8,6 +8,7 @@
XEMACS = @EMACS@
all: lick info
+ cd etc && $(MAKE) EMACS="$(EMACS)" all
lick:
cd lisp && $(MAKE) EMACS="$(EMACS)" lispdir="$(lispdir)" all
Index: make.bat
===================================================================
RCS file: /usr/local/cvsroot/gnus/make.bat,v
retrieving revision 6.9.2.2
diff -u -r6.9.2.2 make.bat
--- make.bat 16 Jun 2004 11:08:48 -0000 6.9.2.2
+++ make.bat 17 Feb 2005 14:32:35 -0000
@@ -173,13 +173,14 @@
echo Stand by while copying etc files.
echo.
if not exist %GNUS_ETC_DIR% mkdir %GNUS_ETC_DIR%
+if not exist %GNUS_ETC_DIR%\images mkdir %GNUS_ETC_DIR%\images
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
-xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\
+if not exist %GNUS_ETC_DIR%\images\gnus mkdir %GNUS_ETC_DIR%\images\gnus
+xcopy /R /Q /Y .\gnus\* %GNUS_ETC_DIR%\gnus\images\
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 not exist %GNUS_ETC_DIR%\smilies\images mkdir %GNUS_ETC_DIR%\smilies\images
+xcopy /R /Q /Y .\smilies\* %GNUS_ETC_DIR%\smilies\images\
if ErrorLevel 1 set ERROR=%ERROR%,copy-etc-smilies-*
goto warnings
cvs server: Diffing contrib
cvs server: Diffing etc
--- Makefile.in.~1.5.2.2.~ 2004-06-15 11:51:47.000000000 +0200
+++ Makefile.in 2005-02-17 15:41:15.565440051 +0100
@@ -14,40 +14,42 @@
SHELL = /bin/sh
all:
+ ln -s . images
install:
$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)
cd $(srcdir) \
&& for p in gnus-tut.txt; do \
- echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
- $(INSTALL_DATA) $$p $(etcdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
+ $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
done
$(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/gnus
cd $(srcdir) \
&& for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
- echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
- $(INSTALL_DATA) $$p $(etcdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
+ $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
done
- $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/smilies
+ $(SHELL) $(top_srcdir)/mkinstalldirs $(etcdir)/images/smilies
cd $(srcdir) \
&& for p in smilies/*.pbm smilies/*.xpm; do \
- echo " $(INSTALL_DATA) $$p $(etcdir)/$$p"; \
- $(INSTALL_DATA) $$p $(etcdir)/$$p; \
+ echo " $(INSTALL_DATA) $$p $(etcdir)/images/$$p"; \
+ $(INSTALL_DATA) $$p $(etcdir)/images/$$p; \
done
uninstall:
rm -f $(etcdir)/gnus-tut.txt
cd $(srcdir) \
&& for p in gnus/*.xpm gnus/*.pbm gnus/*.xbm gnus/x-splash; do \
- rm -f "$(etcdir)/$$p"; \
+ rm -f "$(etcdir)/images/$$p"; \
done
- rmdir $(etcdir)/gnus 2> /dev/null || true
+ rmdir $(etcdir)/images/gnus 2> /dev/null || true
cd $(srcdir) \
&& for p in smilies/*.pbm smilies/*.xpm; do \
- rm -f "$(etcdir)/$$p"; \
+ rm -f "$(etcdir)/images/$$p"; \
done
- rmdir $(etcdir)/smilies 2> /dev/null || true
+ rmdir $(etcdir)/images/smilies 2> /dev/null || true
+ rmdir $(etcdir)/images 2> /dev/null || true
Makefile: $(srcdir)/Makefile.in ../config.status
cd .. \
[-- Attachment #3: Type: text/plain, Size: 771 bytes --]
This patch includes changes to the ./Makefile.in, etc/Makefile.in and
make.bat, but to for lisp/*.el (based on v5-10). I guess that for
lisp/*.el you already have a patch from arch.
Bye, Reiner.
[1] Not included in CVS, only in the tar-balls.
http://arch.debian.org/cgi-bin/archzoom.cgi/srivasta@debian.org--2003-primary/gnus--devo--1.0--base-0/README
[2] While the `not use "make install"' is intended by Lars, the
(X)Emacs version in the 5.10.6 files are not correct and should be
fixed:
,----
| Gnus does absolutely not work with anything older than Emacs 20.3 or
| XEmacs 20.0. You definitely need a relatively current Emacs.
`----
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-17 14:48 ` Reiner Steib
@ 2005-02-17 17:50 ` Reiner Steib
2005-02-19 5:13 ` Miles Bader
0 siblings, 1 reply; 7+ messages in thread
From: Reiner Steib @ 2005-02-17 17:50 UTC (permalink / raw)
On Thu, Feb 17 2005, Reiner Steib wrote:
> On Thu, Feb 17 2005, Miles Bader wrote:
>> Should I propagate this change to Gnus standalone?
>
> As this would minimize the changes in the Lisp files, I'd vote for
> including this to the trunk and to the v5-10 branch.
Sorry, this was unclear. With "changes", I meant the *differences* in
the Lisp files between Gnus' repository (quimby) and Emacs' repository
(savannah).
Bye, Reiner.
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-17 17:50 ` Reiner Steib
@ 2005-02-19 5:13 ` Miles Bader
2005-02-20 20:22 ` Reiner Steib
2005-02-21 12:50 ` Reiner Steib
0 siblings, 2 replies; 7+ messages in thread
From: Miles Bader @ 2005-02-19 5:13 UTC (permalink / raw)
Ok, I've committed all this stuff to Gnus CVS.
CVS was groaning and creaking like was going to explode (and it also
exposed a bug in tla), so be on the lookout for problems!
Thanks,
-Miles
--
My spirit felt washed. With blood. [Eli Shin, on "The Passion of the Christ"]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-19 5:13 ` Miles Bader
@ 2005-02-20 20:22 ` Reiner Steib
2005-02-21 12:50 ` Reiner Steib
1 sibling, 0 replies; 7+ messages in thread
From: Reiner Steib @ 2005-02-20 20:22 UTC (permalink / raw)
On Sat, Feb 19 2005, Miles Bader wrote:
> Ok, I've committed all this stuff to Gnus CVS.
>
> CVS was groaning and creaking like was going to explode (and it also
> exposed a bug in tla), so be on the lookout for problems!
From the commit messages (in gmane.emacs.gnus.cvs) and Norbert's
report I conclude that you moved the images in the repository from
etc/{gnus,smileys} to etc/images/{gnus,smileys}. I assumed that we
would not move them in the repository, but only change the
installation locations and the lisp files. Therefore my patch (for
the Makefiles) doesn't match. Especially "ln -s . images".
As I'm offline ATM, I'm not sure about the current situation.
Bye, Reiner.
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-19 5:13 ` Miles Bader
2005-02-20 20:22 ` Reiner Steib
@ 2005-02-21 12:50 ` Reiner Steib
2005-02-21 14:02 ` Miles Bader
1 sibling, 1 reply; 7+ messages in thread
From: Reiner Steib @ 2005-02-21 12:50 UTC (permalink / raw)
Cc: Miles Bader
[ Resent. The first message(*) didn't arrive on the list.
(*) Date: Sun Feb 20 21:22:13 2005 +0100
Message-ID: <v9fyzrnfre.fsf@marauder.physik.uni-ulm.de>
Addition: Now (Mon, 13:48 CET) everything is fine, AFAICS. ]
On Sat, Feb 19 2005, Miles Bader wrote:
> Ok, I've committed all this stuff to Gnus CVS.
>
> CVS was groaning and creaking like was going to explode (and it also
> exposed a bug in tla), so be on the lookout for problems!
From the commit messages (in gmane.emacs.gnus.cvs) and Norbert's
report I conclude that you moved the images in the repository from
etc/{gnus,smileys} to etc/images/{gnus,smileys}. I assumed that we
would not move them in the repository, but only change the
installation locations and the lisp files. Therefore my patch (for
the Makefiles) doesn't match. Especially "ln -s . images".
As I'm offline ATM, I'm not sure about the current situation.
Bye, Reiner.
--
,,,
(o o)
---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Image location in standalone Gnus
2005-02-21 12:50 ` Reiner Steib
@ 2005-02-21 14:02 ` Miles Bader
0 siblings, 0 replies; 7+ messages in thread
From: Miles Bader @ 2005-02-21 14:02 UTC (permalink / raw)
Cc: Ding List, Miles Bader
On Mon, 21 Feb 2005 13:50:03 +0100, Reiner Steib
<reinersteib+gmane@imap.cc> wrote:
> As I'm offline ATM, I'm not sure about the current situation.
Things seem fine now. I fixed the Makefiles.
-Miles
--
Do not taunt Happy Fun Ball.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-02-21 14:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-02-17 5:23 Image location in standalone Gnus Miles Bader
2005-02-17 14:48 ` Reiner Steib
2005-02-17 17:50 ` Reiner Steib
2005-02-19 5:13 ` Miles Bader
2005-02-20 20:22 ` Reiner Steib
2005-02-21 12:50 ` Reiner Steib
2005-02-21 14:02 ` Miles Bader
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).