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

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 17:35:29 +02:00
commit ca2a35c623
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -104,3 +104,4 @@ b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127 bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128 57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129 a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130

10
LICENSE
View File

@ -325,11 +325,11 @@ License instead of this License.
"CLASSPATH" EXCEPTION TO THE GPL "CLASSPATH" EXCEPTION TO THE GPL
Certain source files distributed by Sun Microsystems, Inc. are subject to Certain source files distributed by Oracle America and/or its affiliates are
the following clarification and special exception to the GPL, but only where subject to the following clarification and special exception to the GPL, but
Sun has expressly included in the particular source file's header the words only where Oracle has expressly included in the particular source file's header
"Sun designates this particular file as subject to the "Classpath" exception the words "Oracle designates this particular file as subject to the "Classpath"
as provided by Sun in the LICENSE file that accompanied this code." exception as provided by Oracle in the LICENSE file that accompanied this code."
Linking this library statically or dynamically with other modules is making Linking this library statically or dynamically with other modules is making
a combined work based on this library. Thus, the terms and conditions of a combined work based on this library. Thus, the terms and conditions of

24
make/deploy-rules.gmk
View File

@ -64,19 +64,17 @@ ifneq ($(JQS), off)
endif endif
endif endif
endif endif
ifneq ($(KERNEL), off) ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(PLATFORM), windows)
ifeq ($(PLATFORM), windows) # Only set up to use UPX compression if it is available
# Only set up to use UPX compression if it is available UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \
UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ $(ECHO) true ; \
$(ECHO) true ; \ else \
else \ $(ECHO) false ; \
$(ECHO) false ; \ fi )
fi ) ifeq ($(UP_TMP), true)
ifeq ($(UP_TMP), true) DEPLOY_BUILD_TARGETS += cmd-comp-all
DEPLOY_BUILD_TARGETS += cmd-comp-all
endif
endif endif
endif endif
endif endif