changeset 815:807cce4fa46a

Merge
author asaha
date Thu, 25 Jul 2013 15:38:00 -0700
parents 1a7bcf5b173d e4bc26c4119a
children 5b1e3cb9af72 a9e59d09051e
files .hgtags Makefile
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jul 23 08:11:08 2013 -0700
+++ b/.hgtags	Thu Jul 25 15:38:00 2013 -0700
@@ -288,7 +288,9 @@
 602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
 fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
 450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b50
 170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
+da9a0cdf4afcfae3a7c47565e9acfd9170ba5a30 jdk7u21-b31
 50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
 a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
 29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
@@ -318,6 +320,9 @@
 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
 2197dde877124579204c5266fa9d89166760b44f jdk7u25-b15
+eeb29025d52ab4ea9bc4f5afa37c3a4fbcaf0011 jdk7u25-b31
+e571b5c75bd194c1aaad6e8e75b1d40f6208391c jdk7u25-b33
+161e4656fea4720ececade6892247a73a2e31a42 jdk7u25-b34
 9846c505054fb91762f3fd9b817d1a9760322029 jdk7u25-b30
 12c2f4ce55d074f0be94781d98cbbbcf8299b666 jdk7u25-b16
 40fde76d9b89f5acc63f4eeeccdc261d9999bf39 jdk7u25-b32
@@ -342,6 +347,7 @@
 da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
 a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35
 07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
 23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
 1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
--- a/Makefile	Tue Jul 23 08:11:08 2013 -0700
+++ b/Makefile	Thu Jul 25 15:38:00 2013 -0700
@@ -263,7 +263,7 @@
 		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
 	        DEBUG_NAME=$(DEBUG_NAME) \
 		GENERATE_DOCS=false \
-		BUILD_INSTALL_BUNDLES=true \
+		$(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
 		CREATE_DEBUGINFO_BUNDLES=true \
 	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
 		generic_build_repo_series