[icedtea-web] RFC: versions should reflect the current changeset id, not repository tip

[Dr Andrew John Hughes]

On 19:21 Wed 23 Feb     , Omair Majid wrote:
> Hi,
> 
> The attached patch makes it so that the IcedTea-Web version string 
> includes the current changeset number, not the changeset number 
> corresponding to tip.
> 
> For people just checking out code or always building icedtea-web from 
> (their) tip, the two are the same. But if you clone the latest version 
> and update to a previous revision (say for bisecting), then the two 
> numbers are quite different; it makes no sense to associate the 
> changeset id for tip with the current changeset id. The attached patch 
> uses hg id -i to obtain the current changeset id.
> 
> As a slight bonus, the version string produced from hg id contains a '+' 
> at the end if the changeset has been modified. For example, building 
> from tip with this patch applied results in:
> 1.1pre+rd7fee305bd4f+
> This should make it easier to tell if the build is based on a pristine 
> changeset or contains local modifications.
> 
> Any thoughts or comments?
> 

Fine, I made the same change in IcedTea6.

Thought I had already approved this...

> Cheers,
> Omair

> diff -r d7fee305bd4f acinclude.m4
> --- a/acinclude.m4	Wed Feb 23 13:37:10 2011 -0500
> +++ b/acinclude.m4	Wed Feb 23 19:10:43 2011 -0500
> @@ -360,7 +360,7 @@
>    if which ${HG} >&AS_MESSAGE_LOG_FD 2>&1; then
>      AC_MSG_CHECKING([for IcedTea Mercurial revision ID])
>      if test -e ${abs_top_srcdir}/.hg ; then 
> -      ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} tip --template '{node|short}')`" ; 
> +      ICEDTEA_REVISION="r`(cd ${abs_top_srcdir}; ${HG} id -i)`" ;
>      fi ;
>      AC_MSG_RESULT([${ICEDTEA_REVISION}])
>      AC_SUBST([ICEDTEA_REVISION])


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37