changeset 261:b3f1bdace6ec

merge with jdk7-b121
author mcimadamore
date Tue, 14 Dec 2010 12:59:03 +0000
parents af6b5c288a2d f1591eed71f6
children 4b8a65fe3482
files
diffstat 4 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Tue Oct 19 11:06:56 2010 +0100
+++ b/.hgignore	Tue Dec 14 12:59:03 2010 +0000
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^webrev
--- a/.hgtags	Tue Oct 19 11:06:56 2010 +0100
+++ b/.hgtags	Tue Dec 14 12:59:03 2010 +0000
@@ -89,3 +89,10 @@
 b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
 c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113
 27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
+e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
+94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
+7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
+a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
+661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
+2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
--- a/make/deploy-rules.gmk	Tue Oct 19 11:06:56 2010 +0100
+++ b/make/deploy-rules.gmk	Tue Dec 14 12:59:03 2010 +0000
@@ -41,12 +41,11 @@
   IMAGES_TARGET = images
 endif
 
-DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
+DEPLOY_BUILD_TARGETS = sanity deploy 
 # Only build 7-Zip LZMA file compression if it is available
 # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
 ifeq ($(ARCH_DATA_MODEL), 32)
   ifeq ($(PLATFORM), windows)
-    ifneq ($(KERNEL), off)
       EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \
         $(ECHO) true ; \
       else \
@@ -55,7 +54,6 @@
   ifeq ($(EC_TMP), true)
         DEPLOY_BUILD_TARGETS += extra-comp-all
       endif
-    endif
   endif
 endif
 
@@ -79,7 +77,6 @@
       ifeq ($(UP_TMP), true)
         DEPLOY_BUILD_TARGETS += cmd-comp-all
       endif
-      DEPLOY_BUILD_TARGETS += kernel-all
     endif
   endif
 endif
--- a/make/install-rules.gmk	Tue Oct 19 11:06:56 2010 +0100
+++ b/make/install-rules.gmk	Tue Dec 14 12:59:03 2010 +0000
@@ -93,6 +93,10 @@
 	fi
 endif
 
+combo_build:
+	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
+	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
+
 install-clobber:
 ifeq ($(BUILD_INSTALL), true)
 	@$(call MakeStart, install, clobber)