[Mesa-dev] [PATCH v2 1/2] mesa: don't touch git_sha1.h if sha1 didn't change

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 05/02/2011 11:06 AM, Marcin Slusarz wrote:
> Less recompiles...
> ---
>  bin/extract_git_sha1     |   10 ++++++++--
>  src/mesa/main/.gitignore |    1 +
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/bin/extract_git_sha1 b/bin/extract_git_sha1
> index e6e6731..5e635d4 100755
> --- a/bin/extract_git_sha1
> +++ b/bin/extract_git_sha1
> @@ -1,10 +1,16 @@
>  #!/bin/sh
> -touch src/mesa/main/git_sha1.h
> +if [ ! -f src/mesa/main/git_sha1.h ]; then
> +	touch src/mesa/main/git_sha1.h
> +fi
> +
>  if which git > /dev/null; then
>      # Extract the 7-digit "short" SHA1 for the current HEAD, convert
>      # it to a string, and wrap it in a #define.  This is used in
>      # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string.
>      git log -n 1 --oneline |\
>  	sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
> -	> src/mesa/main/git_sha1.h
> +	> src/mesa/main/git_sha1.h.tmp
> +    if ! cmp -s src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h; then
> +    	mv src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h
> +    fi
>  fi
> diff --git a/src/mesa/main/.gitignore b/src/mesa/main/.gitignore
> index e48030e..2575f44 100644
> --- a/src/mesa/main/.gitignore
> +++ b/src/mesa/main/.gitignore
> @@ -3,3 +3,4 @@ api_exec_es2.c
>  get_es1.c
>  get_es2.c
>  git_sha1.h
> +git_sha1.h.tmp

The alternative would be to add a 'rm -f src/mesa/main/git_sha1.h.tmp'
at the end of the extract_git_sha1 script.  Either way works for me.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk2/mCMACgkQX1gOwKyEAw+/aACeL+EJK/galRBF/k0pG9iRD4rT
CY4An20bWej0p+E6JavQTeqIQS3zNrAw
=zhtY
-----END PGP SIGNATURE-----