FYI: Versioning support for IcedTea

[Andrew John Hughes]

This patch adds support for reporting the IcedTea
version and Mercurial revision from the resulting build:

$ ~/builder/icedtea/openjdk/build/linux-amd64/bin/java -version
java version "1.7.0_0"
IcedTea 1.8-pre-r1223 Runtime Environment (build 1.7.0_0-b35)
OpenJDK 64-Bit Server VM (build 1.7.0_0-b35, mixed mode)

For releases, just the version is reported i.e. "IcedTea 1.8".
Comments welcome.  It would be nice to have this support in
IcedTea6 too for tracking bugs more easily.

I also fixed a minor issue in that 'hg' was being used directly.
We now always check for a hg binary, but only fail if it's missing
when --enable-hg is set.

ChangeLog:

2008-09-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>

	* Makefile.am:
	Patch the OpenJDK build with the version
	of IcedTea being used. Use $(HG) instead of 'hg'.
	* configure.ac:
	Always check for Mercurial, but only fail
	if --enable-hg is active.

-- 
Andrew :)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 15c4a75ee541 Makefile.am
--- a/Makefile.am	Sat Sep 13 01:08:32 2008 +0100
+++ b/Makefile.am	Sat Sep 13 02:43:32 2008 +0100
@@ -252,7 +252,7 @@
 
 # Mercurial snapshot.
 snapshot: dist
-	mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
+	mv $(DIST_ARCHIVES) $(distdir)-`$(HG) tip --template '{node}'`.tar.gz
 
 # Creates archive of openjdk.
 dist-openjdk: stamps/extract-cacao.stamp
@@ -319,19 +319,19 @@
 if USE_ALT_OPENJDK_SRC_ZIP
 else
 if USE_CLOSURES
-	hg fclone $(CLOSURES_HG_URL) openjdk; 
+	$(HG) fclone $(CLOSURES_HG_URL) openjdk; 
 else
 if USE_CVMI
-	hg fclone $(CVMI_HG_URL) openjdk; 
+	$(HG) fclone $(CVMI_HG_URL) openjdk; 
 else
 if USE_CACIOCAVALLO
-	hg fclone $(CACIOCAVALLO_HG_URL) openjdk;
+	$(HG) fclone $(CACIOCAVALLO_HG_URL) openjdk;
 else
 if USE_BSD
-	hg fclone $(BSD_HG_URL) openjdk;
+	$(HG) fclone $(BSD_HG_URL) openjdk;
 else
 if USE_HG
-	hg fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
+	$(HG) fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
 else
 	if ! echo "$(OPENJDK_MD5SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(MD5SUM) --check ; \
@@ -415,7 +415,7 @@
 else
 if !USE_HG
 else
-	if ! hg fclone -h; \
+	if ! $(HG) fclone -h; \
           then \
           echo "No forest extension found. Please refer to" \
             "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
@@ -678,7 +678,12 @@
 	  echo ERROR patch $${all_patches_ok} FAILED! ; \
 	  echo WARNING make clean-patch before retrying a fix ; \
 	  false; \
-	fi
+	fi ; \
+	if [ -e $(abs_top_srcdir)/.hg ]; then \
+	  revision="-r`(cd $(srcdir); $(HG) tip|grep changeset|cut -d':' -f2|sed -r 's#\W+##')`" ; \
+	fi ; \
+	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
+	sed -i "s#IcedTea#IcedTea $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
 
 clean-patch:
 	rm -f stamps/patch.stamp
diff -r 15c4a75ee541 configure.ac
--- a/configure.ac	Sat Sep 13 01:08:32 2008 +0100
+++ b/configure.ac	Sat Sep 13 02:43:32 2008 +0100
@@ -228,9 +228,13 @@
 WITH_PROJECT
 ENABLE_HG
 
+AC_PATH_TOOL([HG],[hg])
 if test "x${enable_hg}" = "xyes"; then
-  FIND_TOOL([MERCURIAL],[hg])
+  if test "x${HG}" = x; then
+    AC_MSG_ERROR([Mercurial not found; this is required for a hg build])
+  fi
 fi
+AC_SUBST([HG])
 
 dnl pkgconfig cannot be used to find these headers and libraries.
 AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]