stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6983966: remove lzma and upx from repository JDK8

Browse Source 
Reviewed-by: tbell, paulk, ngthomas
This commit is contained in:
David Katleman 2013-06-05 15:20:35 -07:00
parent 227dc3c228
commit 91f5800bbb
3 changed files with 248 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

453
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

9
common/makefiles/Jprt.gmk
View File

@ -133,6 +133,15 @@ else
ifdef ALT_WIXDIR
@$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
endif
ifdef ALT_INSTALL_LZMA_PATH
@$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
endif
ifdef ALT_INSTALL_UPX_PATH
@$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
endif
ifdef ALT_INSTALL_UPX_FILENAME
@$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
endif
ifdef ALT_CCSS_SIGNING_DIR
@$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
endif

32
make/deploy-rules.gmk
View File

@ -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