changeset 234:5cc9bb94398a

Merge
author jqzuo
date Tue, 12 Oct 2010 13:29:44 -0400
parents aaf7fab2e8e4 fd3a1c515903
children e8ebdf41b9c0
files
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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
--- 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)