7009421 X pkg build loses tag version information after the first period nv_157
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 28 Dec 2010 16:33:51 -0800
changeset 1057 f7cec71a5f1e
parent 1056 7ab8c847a602
child 1058 a4a84ddd63a6
7009421 X pkg build loses tag version information after the first period
make_release_packages
pkg/Makefile
--- a/make_release_packages	Tue Dec 28 12:44:43 2010 -0800
+++ b/make_release_packages	Tue Dec 28 16:33:51 2010 -0800
@@ -71,7 +71,7 @@
 if [[ -z "${XNV_BUILDNUM}" ]] ; then
     # Get build version from hg by searching for most recent tag matching nv_*
     BUILD_TAG="$(hg log | \
-             perl -l -n -e 'if ($_ =~ m/^tag:\s+nv_(\d+)/) {print $1 ; exit}')"
+        perl -l -n -e 'if ($_ =~ m/^tag:\s+nv_([\d\.]+)/) {print $1 ; exit}')"
 
     if [[ -z "${BUILD_TAG}" ]] ; then
 	fatal_error "BUILD_TAG could not be found from hg_log"
--- a/pkg/Makefile	Tue Dec 28 12:44:43 2010 -0800
+++ b/pkg/Makefile	Tue Dec 28 16:33:51 2010 -0800
@@ -173,7 +173,7 @@
 	@print "## Substituting build info in versions transformation template"
 	$(PKGDEBUG)XNV_BUILDNUM="$${XNV_BUILDNUM:-$$(hg log | \
 	    $(PERL) -l -n -e \
-		'if ($$_ =~ m/^tag:\s+nv_(\d+)/) { print $$1 ; exit}')}" ; \
+		'if ($$_ =~ m/^tag:\s+nv_([\d\.]+)/) { print $$1 ; exit}')}" ; \
 	PKGVERS_BUILTON="$(RELEASE)" ; \
 	PKGVERS_BRANCH="0.$${XNV_BUILDNUM}" ; \
 	PKGVERS_BUILD="$${PKGVERS_BUILTON}-$${PKGVERS_BRANCH}" ; \