# HG changeset patch
# User jqzuo
# Date 1286904584 14400
# Node ID 5cc9bb94398a281786dd399f4dc12ea37e544934
# Parent  aaf7fab2e8e40ce2509a83a02ee621da7a2320a4# Parent  fd3a1c515903289aaa96839ca9ca6380e12c1318
Merge

diff -r aaf7fab2e8e4 -r 5cc9bb94398a .hgignore
--- a/.hgignore	Thu Oct 07 15:12:00 2010 -0700
+++ b/.hgignore	Tue Oct 12 13:29:44 2010 -0400
@@ -1,3 +1,4 @@
 ^build/
 ^dist/
 /nbproject/private/
+^webrev
diff -r aaf7fab2e8e4 -r 5cc9bb94398a make/deploy-rules.gmk
--- a/make/deploy-rules.gmk	Thu Oct 07 15:12:00 2010 -0700
+++ b/make/deploy-rules.gmk	Tue Oct 12 13:29:44 2010 -0400
@@ -41,7 +41,7 @@
   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)
@@ -79,7 +79,6 @@
       ifeq ($(UP_TMP), true)
         DEPLOY_BUILD_TARGETS += cmd-comp-all
       endif
-      DEPLOY_BUILD_TARGETS += kernel-all
     endif
   endif
 endif
diff -r aaf7fab2e8e4 -r 5cc9bb94398a make/install-rules.gmk
--- a/make/install-rules.gmk	Thu Oct 07 15:12:00 2010 -0700
+++ b/make/install-rules.gmk	Tue Oct 12 13:29:44 2010 -0400
@@ -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)