Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 23 Jan 2013 08:50:19 -0500
- author
- cgruszka
- date
- Wed, 23 Jan 2013 08:50:19 -0500
- changeset 586
- f9163f9cb1da
- parent 581
- dc84b505b408
- parent 585
- 61d7e2971723
- child 590
- b43aa5bd8ca5
Merge
1.1 --- a/make/install-rules.gmk Wed Jan 16 22:16:51 2013 -0800 1.2 +++ b/make/install-rules.gmk Wed Jan 23 08:50:19 2013 -0500 1.3 @@ -96,6 +96,9 @@ 1.4 combo_build: 1.5 @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` 1.6 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all 1.7 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all 1.8 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo 1.9 + $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all 1.10 1.11 install-clobber: 1.12 ifeq ($(BUILD_INSTALL), true)
