Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgignore	Thu Oct 07 15:12:00 2010 -0700
     1.2 +++ b/.hgignore	Tue Oct 12 13:29:44 2010 -0400
     1.3 @@ -1,3 +1,4 @@
     1.4  ^build/
     1.5  ^dist/
     1.6  /nbproject/private/
     1.7 +^webrev

     2.1 --- a/make/deploy-rules.gmk	Thu Oct 07 15:12:00 2010 -0700
     2.2 +++ b/make/deploy-rules.gmk	Tue Oct 12 13:29:44 2010 -0400
     2.3 @@ -41,7 +41,7 @@
     2.4    IMAGES_TARGET = images
     2.5  endif
     2.6  
     2.7 -DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all 
     2.8 +DEPLOY_BUILD_TARGETS = sanity deploy 
     2.9  # Only build 7-Zip LZMA file compression if it is available
    2.10  # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available
    2.11  ifeq ($(ARCH_DATA_MODEL), 32)
    2.12 @@ -79,7 +79,6 @@
    2.13        ifeq ($(UP_TMP), true)
    2.14          DEPLOY_BUILD_TARGETS += cmd-comp-all
    2.15        endif
    2.16 -      DEPLOY_BUILD_TARGETS += kernel-all
    2.17      endif
    2.18    endif
    2.19  endif

     3.1 --- a/make/install-rules.gmk	Thu Oct 07 15:12:00 2010 -0700
     3.2 +++ b/make/install-rules.gmk	Tue Oct 12 13:29:44 2010 -0400
     3.3 @@ -93,6 +93,10 @@
     3.4  	fi
     3.5  endif
     3.6  
     3.7 +combo_build:
     3.8 +	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
     3.9 +	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
    3.10 +
    3.11  install-clobber:
    3.12  ifeq ($(BUILD_INSTALL), true)
    3.13  	@$(call MakeStart, install, clobber)