OpenJDK / amber / amber
changeset 6783:d810e47e9402
Merge
| author | duke |
|---|---|
| date | Wed, 05 Jul 2017 17:24:37 +0200 |
| parents | 6c5fa35fa077 78cff985750d |
| children | b2351f6b4652 |
| files | |
| diffstat | 4 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Wed Oct 20 16:49:06 2010 -0700 +++ b/.hgignore Wed Jul 05 17:24:37 2017 +0200 @@ -1,3 +1,4 @@ ^build/ ^dist/ /nbproject/private/ +^webrev
--- a/.hgtags-top-repo Wed Oct 20 16:49:06 2010 -0700 +++ b/.hgtags-top-repo Wed Jul 05 17:24:37 2017 +0200 @@ -88,3 +88,4 @@ 9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111 b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112 c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113 +27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
--- a/make/deploy-rules.gmk Wed Oct 20 16:49:06 2010 -0700 +++ b/make/deploy-rules.gmk Wed Jul 05 17:24:37 2017 +0200 @@ -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 Wed Oct 20 16:49:06 2010 -0700 +++ b/make/install-rules.gmk Wed Jul 05 17:24:37 2017 +0200 @@ -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)