774736 - Don't use $(shell) for Sync's version

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Gregory Szorc [:gps]]

services/sync/Makefile.in is using a $(shell) to obtain the Sync version number:

WEAVE_VERSION = $(shell cat $(topsrcdir)/services/sync/version.txt)

AFAICT, we only reference version.txt from Makefile.in. So, I think we can delete version.txt and just store the version string in Makefile.in.

rnewman/philikon: am I missing other consumers of version.txt?

Comment 1

[Gregory Szorc [:gps]]

Attachment: Remove version.txt, general cleanup

I removed version.txt and performed some cosmetic cleanup while I was here.

The version incremented because we haven't done that since the Firefox 17 switchover yet (rnewman or I does that every release - we have a bug on file to get the tree people to do it when they make a new release).

This file also needs some love to fix the libs:: abuse. That is the work of bug 759487.

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 643024 [details] [diff] [review]
Remove version.txt, general cleanup

Review of attachment 643024 [details] [diff] [review]:
-----------------------------------------------------------------

::: services/sync/Makefile.in
@@ +10,5 @@
>  
>  include $(DEPTH)/config/autoconf.mk
>  
>  # Definitions used by constants.js.
> +weave_version := 1.19.0

Why do you change the version number?
r=me with this sorted out.

Comment 3

[Mike Hommey [:glandium]]

(In reply to Mike Hommey [:glandium] from comment #2)
> Comment on attachment 643024 [details] [diff] [review]
> Remove version.txt, general cleanup
> 
> Review of attachment 643024 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> ::: services/sync/Makefile.in
> @@ +10,5 @@
> >  
> >  include $(DEPTH)/config/autoconf.mk
> >  
> >  # Definitions used by constants.js.
> > +weave_version := 1.19.0
> 
> Why do you change the version number?
> r=me with this sorted out.

Ah, didn't see comment 1.

Comment 4

[Gregory Szorc [:gps]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/b62f77f85ea4

I also removed the empty line at the top of the file. Thank you for the very quick review!

Comment 5

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/b62f77f85ea4