Bug 26120

Created attachment 32717 [details] [review]
configure.ac: modernize a bit

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

Created attachment 32718 [details] [review]
Automatic version generation

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

(In reply to comment #1)
> Created an attachment (id=32717) [details]
> configure.ac: modernize a bit

Merged and released in 0.3.3.

(In reply to comment #2)
> Created an attachment (id=32718) [details]
> Automatic version generation

Will and I don't see the point in this, so I didn't merge it.

Thanks for your patches.

(In reply to comment #3)
> (In reply to comment #2)
> > Created an attachment (id=32718) [details] [details]
> > Automatic version generation
> 
> Will and I don't see the point in this, so I didn't merge it.

Try it some time. Making a release is just one command: git tag.

Besides, suppose you looking at a debug log and see something like this:
started version 0.3.2 (telepathy-glib version 0.9.2)

Versus:
started version 0.3.2-2maemo1 (telepathy-glib version 0.9.2)

Or even:
started version 0.3.2-10-g2be75d5 (telepathy-glib version 0.9.2)

> Thanks for your patches.

Thanks to you.

(In reply to comment #4)
> (In reply to comment #3)
> > (In reply to comment #2)
> > > Created an attachment (id=32718) [details] [details] [details]
> > > Automatic version generation
> > 
> > Will and I don't see the point in this, so I didn't merge it.
> 
> Try it some time. Making a release is just one command: git tag.
> 
> Besides, suppose you looking at a debug log and see something like this:
> started version 0.3.2 (telepathy-glib version 0.9.2)
> 
> Versus:
> started version 0.3.2-2maemo1 (telepathy-glib version 0.9.2)
> 
> Or even:
> started version 0.3.2-10-g2be75d5 (telepathy-glib version 0.9.2)

I'm in favour of sticking the git revision into stuff built from Git snapshots. Is this actually updated on commit, or only when re-running autogen?

Also, the patch breaks the stuff 10 lines down that makes loads of compiler warnings fatal for non-releases.

(In reply to comment #5)
> (In reply to comment #4)
> > Or even:
> > started version 0.3.2-10-g2be75d5 (telepathy-glib version 0.9.2)
> 
> I'm in favour of sticking the git revision into stuff built from Git snapshots.
> Is this actually updated on commit, or only when re-running autogen?

Only when running autogen. This is exactly what they do in autoconf itself, and a bunch of GNOME packages.

I use a different method in my own packages that keeps it always up to date but I don't think you want that.

> Also, the patch breaks the stuff 10 lines down that makes loads of compiler
> warnings fatal for non-releases.

Ah, right, I didn't see that. If you are still interested I can cook something up.

(In reply to comment #6)
> (In reply to comment #5)
> > I'm in favour of sticking the git revision into stuff built from Git snapshots.
> > Is this actually updated on commit, or only when re-running autogen?
> 
> Only when running autogen. This is exactly what they do in autoconf itself, and
> a bunch of GNOME packages.

Hmm. I wonder if more-specific but stale information is worse than less-specific but accurate information.

> I use a different method in my own packages that keeps it always up to date but
> I don't think you want that.

Hmm, what's your method, out of interest?

(In reply to comment #7)
> (In reply to comment #6)
> > (In reply to comment #5)
> Hmm. I wonder if more-specific but stale information is worse than
> less-specific but accurate information.

Good point. It might not be particularly useful on personal environments, but it might on distributions.

> > I use a different method in my own packages that keeps it always up to date but
> > I don't think you want that.
> 
> Hmm, what's your method, out of interest?

I always rebuild the files that actually use the version (src/main.o). However, I use plain Makefiles, so it's easier to get the version each time I run 'make'.

Created attachment 51375 [details] [review]
Trivial cleanups

Trivial stuff.

Created attachment 51376 [details] [review]
Automatic version generation

Here's a new version of the patch that sets correctly the release variable.

It would be trivial to change 0.5.0-4-gd8d75d9 to 0.5.0-4-git, or whatever.

Comment on attachment 51375 [details] [review]
Trivial cleanups

Review of attachment 51375 [details] [review]:
-----------------------------------------------------------------

Committed, thanks.

Created attachment 53747 [details] [review]
Automatic version generation

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

I had to tweak your patch a little: dist-hook is also defined in tools/telepathy.am so I got warnings about it being redefined, and there was a syntax error in configure.ac.

This seems pretty nifty, although I had to remember to re-run autogen.sh after creating a test tag (whereas, at present, the act of bumping the version number triggers that). So it doesn't cut a step out of distcheck (and actually I suspect it would be quite easy to release a tarball with the wrong version number stamped on the outside). I'll have a think about how to tweak 'make maintainer-make-release' to, rather than creating a tag after the build has succeeded, check that autogen's been rerun if necessary.

Sorry, I don't think this is going to be merged.