PATCH: (incomplete - see 12594) icon for zsh under Cygwin

PATCH: (incomplete - see 12594) icon for zsh under Cygwin

[Andrej Borsenkow]

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

This is the most straightforward solution. The patch is incomplete - you need
Srz/zsh.ico and Src/zsh.rc from Peter's 12594 (but note, that in this archive
they are in Src/Modules; beware when extracting). I could not convince GNU
diff 2.7 to diff binary file.

I modified Makefile rules; original had obvious problem when building in
source directory.

-andrej

Have a nice DOS!
B >>

[-- Attachment #2: zsh-icon.diff --]
[-- Type: application/octet-stream, Size: 1805 bytes --]

Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.25
diff -u -r1.25 configure.in
--- configure.in	2000/08/15 05:13:41	1.25
+++ configure.in	2000/08/16 11:14:07
@@ -1693,6 +1693,10 @@
 AC_SUBST(INSTLIB)dnl
 AC_SUBST(UNINSTLIB)dnl
 
+if test x"$ac_cv_cygwin" = xyes; then
+  EXTRAZSHOBJS="$EXTRAZSHOBJS zsh.res.o"
+fi
+
 AC_DEFINE_UNQUOTED(DL_EXT, "$DL_EXT")dnl
 AC_SUBST(D)dnl
 AC_SUBST(DL_EXT)dnl
@@ -1708,6 +1712,7 @@
 AC_SUBST(MOD_EXPORT)dnl
 AC_SUBST(MOD_IMPORT_VARIABLE)dnl
 AC_SUBST(MOD_IMPORT_FUNCTION)dnl
+AC_SUBST(EXTRAZSHOBJS)
 
 CLEAN_MK="${srcdir}/Config/clean.mk"
 CONFIG_MK="${srcdir}/Config/config.mk"
Index: Src/Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- Src/Makefile.in	2000/08/02 18:01:51	1.5
+++ Src/Makefile.in	2000/08/16 11:14:08
@@ -78,14 +78,19 @@
 LDRUNPATH = LD_RUN_PATH=$(libdir)/$(tzsh)
 NDRUNPATH =
 
-zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export
+EXTRAZSHOBJS = @EXTRAZSHOBJS@
+
+zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export $(EXTRAZSHOBJS)
 	rm -f $@
-	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
+	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
 
 $(LIBZSH): $(LIBOBJS) $(NSTMP)
 	rm -f $@
 	$(DLLINK) $(LIBOBJS) $(NLIST) $(LIBS)
 
+zsh.res.o: $(sdir)/zsh.rc $(sdir)/zsh.ico
+	windres -O coff --include-dir $(sdir) -i $(sdir)/zsh.rc -o zsh.res.o
+	
 stamp-modobjs: modobjs
 	@if cmp -s stamp-modobjs.tmp stamp-modobjs; then \
 	    rm -f stamp-modobjs.tmp; \

Re: PATCH: (incomplete - see 12594) icon for zsh under Cygwin

[Peter Stephenson]

Andrej wrote:
> This is the most straightforward solution. The patch is incomplete - you need
> Srz/zsh.ico and Src/zsh.rc from Peter's 12594 (but note, that in this archive
> they are in Src/Modules; beware when extracting). I could not convince GNU
> diff 2.7 to diff binary file.

I have committed all four file changes (configure.in, Src/Makefile.in,
Src/zsh.ico, Src/zsh.rc).  This seems to work fine.  Is there any easy way
of getting icons for other systems?  (Maybe it should be an option, but (a)
Windows users aren't used to having choices (b) it's all of 1k and I don't
think Win32 has been ported to the Commodore VIC 20.)

-- 
Peter Stephenson <pws@csr.com>
Cambridge Silicon Radio, Unit 300, Science Park, Milton Road,
Cambridge, CB4 0XL, UK                          Tel: +44 (0)1223 392070

RE: PATCH: (incomplete - see 12594) icon for zsh under Cygwin

[Andrej Borsenkow]

>
> I have committed all four file changes (configure.in, Src/Makefile.in,
> Src/zsh.ico, Src/zsh.rc).  This seems to work fine.  Is there any easy way
> of getting icons for other systems?

I do not think that any Unix is using embedded resources. For X11 we can
simply distribute an icon (or, probably, more - CDE is using three different
sizes) in standard format and let users do whatever they want with it (I'd
like to replace standard terminal icon here with Zsh one :-)

-andrej