Re: zsh-5.0.5-dev-1

Re: zsh-5.0.5-dev-1

[Axel Beckert]

Hi Peter,

On Sun, Aug 10, 2014 at 07:12:41PM +0100, Peter Stephenson wrote:
> There's a test release 5.0.5-dev-1 for 5.0.6 under
> 
> http://www.zsh.org/pub/development/
> 
> for those that wish to try it out before I release it.
> 
> I don't think there have been any structural changes this time, so with
> any luck there shouldn't be any serious installation problems.

Hrm. Not sure if there's something missing in the tar ball of if
there's some need to change our packaging in Debian, but generating
the docs fails as follows:

  make[2]: *** No rule to make target '../../Doc/texi2html.conf', needed by 'zsh_toc.html'.  Stop.

Will investigate.

P.S.: Could you also push the git tag for the commit from which you've
built the tar balls?d

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: zsh-5.0.5-dev-1

[Axel Beckert]

Hi again,

On Mon, Aug 11, 2014 at 06:06:11PM +0200, Axel Beckert wrote:
> Hrm. Not sure if there's something missing in the tar ball of if
> there's some need to change our packaging in Debian, but generating
> the docs fails as follows:
> 
>   make[2]: *** No rule to make target '../../Doc/texi2html.conf', needed by 'zsh_toc.html'.  Stop.

Just a minor correction: It's surely not the tar-ball -- we're
building from a git checkout. But it still looks fishy...

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: zsh-5.0.5-dev-1

[Peter Stephenson]

On Mon, 11 Aug 2014 18:06:12 +0200
Axel Beckert <abe@deuxchevaux.org> wrote:
> Hrm. Not sure if there's something missing in the tar ball of if
> there's some need to change our packaging in Debian, but generating
> the docs fails as follows:
> 
>   make[2]: *** No rule to make target '../../Doc/texi2html.conf', needed by 'zsh_toc.html'.  Stop.
> 
> Will investigate.

I suspect this is to do with building in a directory other than the
source directory.  The references to $(sdir)/texi2html.conf and plain
texi2html.conf might be inconsistent.  I suspect the $(sdir)'s shouldn't
be there.   It looks like this changed shortly after the previous
release.

pws

Re: zsh-5.0.5-dev-1

[Axel Beckert]

Hi again,

On Mon, Aug 11, 2014 at 06:06:12PM +0200, Axel Beckert wrote:
> Hrm. Not sure if there's something missing in the tar ball of if
> there's some need to change our packaging in Debian, but generating
> the docs fails as follows:
> 
>   make[2]: *** No rule to make target '../../Doc/texi2html.conf', needed by 'zsh_toc.html'.  Stop.
> 
> Will investigate.

It seems as if commit 3c25cb29aba4d4c1a907aa29db48c36d8dbac18e mixed
up source and build directories and hence broke out of tree building.

At least the following patch fixes it for me:

Index: zsh/Doc/Makefile.in
===================================================================
--- zsh.orig/Doc/Makefile.in	2014-08-11 18:18:12.000000000 +0200
+++ zsh/Doc/Makefile.in	2014-08-11 18:19:55.000000000 +0200
@@ -160,7 +160,7 @@
 html: zsh_toc.html
 .PHONY: html
 
-zsh_toc.html: $(sdir)/zsh.texi $(sdir)/texi2html.conf
+zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
 	$(TEXI2HTML) $(sdir)/zsh.texi
 
 zshall.1: zsh.yo
@@ -251,7 +251,7 @@
 
 texi2html.conf: $(sdir_top)/Config/version.mk
 	echo '$$PRE_BODY_CLOSE = "<font size=\"-1\">Zsh version $(VERSION), released on $(VERSION_DATE).</font>";' \
-	    > $(sdir)/$@
+	    > $@
 
 Zsh/modlist.yo: $(MODDOCSRC)
 	( \

Haven't yet tested it with in-tree-building though. I'm also slightly
surprised that this only came up now. That commit is from January. So
maybe I'm still missing something else...

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: zsh-5.0.5-dev-1

[Peter Stephenson]

On Mon, 11 Aug 2014 18:30:02 +0200
Axel Beckert <abe@deuxchevaux.org> wrote:
> It seems as if commit 3c25cb29aba4d4c1a907aa29db48c36d8dbac18e mixed
> up source and build directories and hence broke out of tree building.

Yes, crossed with my last message.
 
> At least the following patch fixes it for me:

It looks like there's one more that needs changing in the TEXI2HTML =
macro assignment (I'm not quite sure how it works without that).

> Haven't yet tested it with in-tree-building though. I'm also slightly
> surprised that this only came up now. That commit is from January. So
> maybe I'm still missing something else...

I think the habit of building files in a different location from the
source isn't very frequent at the moment; furthermore if one of your
builds uses that directory you probably get the file you need.

pws

Re: zsh-5.0.5-dev-1

[Bart Schaefer]

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

On Aug 11, 2014 9:39 AM, "Peter Stephenson" <p.stephenson@samsung.com>
wrote:
>
> I think the habit of building files in a different location from the
> source isn't very frequent at the moment

Just a note that I build in a separate tree all the time, because I have
static and dynamic links of the same source ... but I hardly ever try
building the HTML doc.

Re: zsh-5.0.5-dev-1

[Axel Beckert]

Hi Peter,

it's good to see you came to the same or at least very similar
conclusions. :-)

On Mon, Aug 11, 2014 at 05:39:31PM +0100, Peter Stephenson wrote:
> > Haven't yet tested it with in-tree-building though. I'm also slightly
> > surprised that this only came up now. That commit is from January. So
> > maybe I'm still missing something else...
> 
> I think the habit of building files in a different location from the
> source isn't very frequent at the moment;

It's because we build a dynamically linked zsh (plus docs) and a
statically linked zsh and then distribute the built files into their
packages... Worked fine so far. :-)

> furthermore if one of your builds uses that directory you probably
> get the file you need.

I'm not sure to which directory you refer to by "that directory".

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: zsh-5.0.5-dev-1

[Axel Beckert]

Hi,

On Mon, Aug 11, 2014 at 05:39:31PM +0100, Peter Stephenson wrote:
> It looks like there's one more that needs changing in the TEXI2HTML =
> macro assignment (I'm not quite sure how it works without that).

Indeed. It just throws a warning there with my patch:

  makeinfo: warning: could not read init file ../../Doc/texi2html.conf

(We use makeinfo instead of texi2html which IIRC is deprecated.)

The following additional change should fix this:

-            --init-file $(sdir)/texi2html.conf
+            --init-file texi2html.conf

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: zsh-5.0.5-dev-1

[Peter Stephenson]

I've updated Doc/Makefile.in with the two changes; I'll make another
build when I get home since this was the only issue I've heard about.

pws

Raw ^A in Doc/Makefile.in on purpose? (was: zsh-5.0.5-dev-1)

[Axel Beckert]

Hi,

On Sun, Aug 10, 2014 at 07:12:41PM +0100, Peter Stephenson wrote:
> There's a test release 5.0.5-dev-1 for 5.0.6 under
> 
> http://www.zsh.org/pub/development/
> 
> for those that wish to try it out before I release it.

My debian package build still fails, because I've applied the patch
from the other branch of this thread. Applying the patch with
dpkg-source fails because there is a 0x01 (^A) character behind
"modmenu.yo)" in line 266 at column 45.

Is that ^A on purpose?

(If so, I've got a slight problem as I have no idea yet how to patch
that file with dpkg-source properly then. But in that case it would be
my problem, not zsh's. So I hope, the ^A is accidentially. :-)

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: Raw ^A in Doc/Makefile.in on purpose? (was: zsh-5.0.5-dev-1)

[Bart Schaefer]

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

Yes, it's on purpose ... See Doc/zman.yo in the DEFINECHARTABLE(standard)
macro.

Re: Raw ^A in Doc/Makefile.in on purpose? (was: zsh-5.0.5-dev-1)

[Axel Beckert]

Hi Bart,

On Mon, Aug 11, 2014 at 10:33:00AM -0700, Bart Schaefer wrote:
> Yes, it's on purpose ...

*sigh*

> See Doc/zman.yo in the DEFINECHARTABLE(standard) macro.

Thanks for the pointer. Will have to see how I can make dpkg-source to
patch that properly.

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)

Re: Raw ^A in Doc/Makefile.in on purpose? (was: zsh-5.0.5-dev-1)

[Axel Beckert]

Hi,

On Mon, Aug 11, 2014 at 07:37:27PM +0200, Axel Beckert wrote:
> On Mon, Aug 11, 2014 at 10:33:00AM -0700, Bart Schaefer wrote:
> > Yes, it's on purpose ...
> > See Doc/zman.yo in the DEFINECHARTABLE(standard) macro.
> 
> Thanks for the pointer. Will have to see how I can make dpkg-source to
> patch that properly.

All clear now. Cause was not the ^A but PEBKAC. :-) Sorry for the noise.

		Kind regards, Axel
-- 
/~\  Plain Text Ribbon Campaign                   | Axel Beckert
\ /  Say No to HTML in E-Mail and News            | abe@deuxchevaux.org  (Mail)
 X   See http://www.nonhtmlmail.org/campaign.html | abe@noone.org (Mail+Jabber)
/ \  I love long mails: http://email.is-not-s.ms/ | http://noone.org/abe/ (Web)