diff options
| author | katleman <none@none> | 2013-06-05 15:20:35 -0700 |
|---|---|---|
| committer | katleman <none@none> | 2013-06-05 15:20:35 -0700 |
| commit | 5ec1c954e40a92cdb5b0012bba14c94c95579f91 (patch) | |
| tree | e227ec05b199934804bcab66507bb490e352ec8f /make | |
| parent | fd9c934beab0634a26fae21c72371828ea857506 (diff) | |
6983966: remove lzma and upx from repository JDK8jdk8-b93
Reviewed-by: tbell, paulk, ngthomas
Diffstat (limited to 'make')
| -rw-r--r-- | make/deploy-rules.gmk | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index fede83a..69c493d 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -42,20 +42,6 @@ else endif 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) - ifeq ($(PLATFORM), windows) - EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(EC_TMP), true) - DEPLOY_BUILD_TARGETS += extra-comp-all - endif - endif -endif ifneq ($(JQS), off) ifeq ($(ARCH_DATA_MODEL), 32) @@ -65,22 +51,6 @@ ifneq ($(JQS), off) endif endif -ifeq ($(ARCH_DATA_MODEL), 32) - ifeq ($(PLATFORM), windows) - # Only set up to use UPX compression if it is available - UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ - $(ECHO) true ; \ - else \ - $(ECHO) false ; \ - fi ) - ifeq ($(UP_TMP), true) - DEPLOY_BUILD_TARGETS += cmd-comp-all - endif - endif -endif - - - ifndef DEV_ONLY DEPLOY_BUILD_TARGETS += images else |