Merge jdk7u45-b12 into jdk7u45-b13
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 3efdfd5..f078c9d 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -367,3 +367,4 @@
b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
+a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
diff --git a/corba/.hgtags b/corba/.hgtags
index f37dc3a..624e38c 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -370,3 +370,4 @@
a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
+336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 2cc6438..b7bb34f 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -579,3 +579,4 @@
996b6863b3b2468cece20d7a6f571f9ec1b7830c jdk7u45-b09
bcaf889eea9e64d30f8c3aefdcdc2c2ee29406f2 jdk7u45-b10
7ca907428850dc2aa99ee4a906446e479dbeb392 jdk7u45-b11
+ed1505510ea0e94b17f968cdb3e8aba13c99d543 jdk7u45-b12
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 3151123..46631de 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -370,3 +370,4 @@
255d92f5ed98915a025484360963d7d09bd77313 jdk7u45-b09
28a18e725bb39d47e920ef910f435321fb891a88 jdk7u45-b10
3d3b4da34d583e86a3b90b8f69927a37d40f5b57 jdk7u45-b11
+2ac5c9749223f205cd081ecd0028b2f3ea13f8f8 jdk7u45-b12
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 53336dd..625db81 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -370,3 +370,4 @@
ab835f7247e40dd7fb457830eaa31c550b434413 jdk7u45-b09
bbd594e6cf45ebfc37c71e217772b7f37a9c5750 jdk7u45-b10
c01eab96821e3c0315c4637e61a8015cbfe63b6a jdk7u45-b11
+05f1274a8aa019584b4ceb05c73fc89bf7b7f4de jdk7u45-b12
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 1afeb3b..64b8b3e 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -354,3 +354,4 @@
6e2313d45f0c50d824531b32d3f577aa0b357551 jdk7u45-b09
d4506b816f63330489e00ba0b9e3c6583a8a9efa jdk7u45-b10
ee87452ba9e2b4b7d847bd2a7910a8aaeacfea7b jdk7u45-b11
+d5e393a55e6adc2f1b9aaa752a5004fa07561480 jdk7u45-b12
diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk
index 2e514d2..6683937 100644
--- a/jdk/make/common/shared/Defs.gmk
+++ b/jdk/make/common/shared/Defs.gmk
@@ -296,10 +296,8 @@
RELEASE = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
endif
-# FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
-ifdef BUILD_NUMBER
- FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
-else
+# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
+ifndef BUILD_NUMBER
BUILD_NUMBER = b00
ifndef USER_RELEASE_SUFFIX
BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
@@ -307,6 +305,12 @@
USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' )
endif
export USER_RELEASE_SUFFIX
+endif
+
+# FULL_VERSION is RELEASE and BUILD_NUMBER if USER_RELEASE_SUFFIX is not set
+ifndef USER_RELEASE_SUFFIX
+ FULL_VERSION = $(RELEASE)-$(BUILD_NUMBER)
+else
FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
endif
diff --git a/langtools/.hgtags b/langtools/.hgtags
index e8f6bba..8a9f49c 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -370,3 +370,4 @@
a9c31d3f8188b344ed165ec0730ebc2fd11dfa5d jdk7u45-b09
2c09352066ec34c8608ccff0f933f566a52033af jdk7u45-b10
53d5c06766b05689cdccfc300b32075878e8aa1d jdk7u45-b11
+0b6aa6e95eb9da58a686edacf5b102116614d3ea jdk7u45-b12
