2189d1b41a
6845973: Update JDK7 with deployment changes in 6u13, 6u14
4802695: Support 64-bit Java Plug-in and Java webstart on Windows/Linux on AMD64
6825019: DownloadManager should not be loaded and referenced for full JRE
6738770: REGRESSION:JSException throws when use LiveConnect javascript facility
6772884: plugin2 : java.lang.OutOfMemoryError or crash
6707535: Crossing domain hole affecting multiple sites/domains using plug-in
6728071: Non-verification of Update files may allow unintended updates
6704154: Code loaded from local filesystem should not get access to localhost
6727081: Web Start security restrictions bypass using special extension jnlp
6727079: Java Web Start Socket() restriction bypass
6727071: Cache location/user name information disclosure in SingleInstanceImpl
6716217: AppletClassLoader adds permissions based on codebase regardless of CS
6694892: Java Webstart inclusion via system properties override [CVE-2008-2086]
6704074: localhost socket access due to cache location exposed
6703909: Java webstart arbitrary file creation using nativelib
6665315: browser crashes when deployment.properties has more slashes ( / )
6660121: Encoding values in JNLP files can cause buffer overflow
6606110: URLConnection.setProxiedHost for resources that are loaded via proxy
6581221: SSV(VISTA): Redirection FAILS to work if user does a downgrade install
6609756: Buffer Overflow in Java ActiveX component
6608712: Bypassing the same origin policy in Java with crafted names
6534630: "gnumake clobber" doesn't
6849953: JDK7 - replacement of bufferoverflowU.lib on amd64 breaks build
6849029: Need some JDK7 merge clean-up after comments on the webrev
6847582: Build problem on JDK7 with isSecureProperty in merge
6827935: JDK 7 deployment merging - problem in Compiler-msvm.gmk
6823215: latest merge fixes from 6u12 -> JDK7
6816153: further mergers for JDK7 deployment integration
6807074: Fix Java Kernel and JQS in initial JDK7 builds
Initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh
159 lines
4.0 KiB
Plaintext
159 lines
4.0 KiB
Plaintext
#
|
|
# Copyright 2002-2007 Sun Microsystems, Inc. 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
|
|
# under the terms of the GNU General Public License version 2 only, as
|
|
# published by the Free Software Foundation. Sun designates this
|
|
# particular file as subject to the "Classpath" exception as provided
|
|
# by Sun in the LICENSE file that accompanied this code.
|
|
#
|
|
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
# version 2 for more details (a copy is included in the LICENSE file that
|
|
# accompanied this code).
|
|
#
|
|
# You should have received a copy of the GNU General Public License version
|
|
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
#
|
|
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
|
# CA 95054 USA or visit www.sun.com if you need additional information or
|
|
# have any questions.
|
|
#
|
|
|
|
################################################################
|
|
# DEPLOY TARGETS
|
|
################################################################
|
|
|
|
deploy: deploy-build
|
|
|
|
DEPLOY = deploy
|
|
|
|
BUILD_DEPLOY=true
|
|
|
|
ifeq ($(ARCH), ia64)
|
|
BUILD_DEPLOY=false
|
|
endif
|
|
|
|
ifeq ($(ARCH), sparcv9)
|
|
BUILD_DEPLOY=false;
|
|
endif
|
|
|
|
ifeq ($(ARCH), amd64)
|
|
ifeq ($(PLATFORM), solaris)
|
|
BUILD_DEPLOY=false
|
|
endif
|
|
endif
|
|
|
|
|
|
# put the generated bundles in their own place in OUTPUTDIR
|
|
DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR)
|
|
|
|
# NO_IMAGES may be set in conjunction with DEV_ONLY
|
|
ifdef NO_IMAGES
|
|
IMAGES_TARGET =
|
|
else
|
|
IMAGES_TARGET = images
|
|
endif
|
|
|
|
DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all
|
|
# 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)
|
|
ifneq ($(KERNEL), off)
|
|
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
|
|
endif
|
|
|
|
ifneq ($(JQS), off)
|
|
ifeq ($(ARCH_DATA_MODEL), 32)
|
|
ifeq ($(PLATFORM), windows)
|
|
DEPLOY_BUILD_TARGETS += jqs-all
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(KERNEL), off)
|
|
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
|
|
DEPLOY_BUILD_TARGETS += kernel-all
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
ifndef DEV_ONLY
|
|
DEPLOY_BUILD_TARGETS += images
|
|
else
|
|
DEPLOY_BUILD_TARGETS += $(IMAGES_TARGET)
|
|
endif
|
|
|
|
DEPLOY_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \
|
|
ALT_OUTPUTDIR=$(DEPLOY_OUTPUTDIR)
|
|
|
|
ifeq ($(BUILD_LANGTOOLS), true)
|
|
DEPLOY_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
|
|
endif
|
|
|
|
ifdef ALT_IMAGE_DIR
|
|
DEPLOY_BUILD_ARGUMENTS += ALT_IMAGE_DIR=$(ALT_IMAGE_DIR)
|
|
endif
|
|
|
|
ifdef ALT_BUNDLE_DATE
|
|
DEPLOY_BUILD_ARGUMENTS += ALT_BUNDLE_DATE=$(ALT_BUNDLE_DATE)
|
|
endif
|
|
|
|
ifdef ALT_JAVAWS_BOOTDIR
|
|
DEPLOY_BUILD_ARGUMENTS += ALT_JAVAWS_BOOTDIR=$(ALT_JAVAWS_BOOTDIR)
|
|
endif
|
|
|
|
ifdef CERT
|
|
DEPLOY_BUILD_ARGUMENTS += CERT=$(CERT)
|
|
endif
|
|
|
|
ifdef PKEY
|
|
DEPLOY_BUILD_ARGUMENTS += PKEY=$(PKEY)
|
|
endif
|
|
|
|
deploy-build:
|
|
ifeq ($(BUILD_DEPLOY), true)
|
|
($(CD) $(DEPLOY_TOPDIR)/make && \
|
|
$(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS))
|
|
endif
|
|
|
|
deploy-clobber::
|
|
ifeq ($(BUILD_DEPLOY), true)
|
|
($(CD) $(DEPLOY_TOPDIR)/make && \
|
|
$(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
|
|
endif
|
|
|
|
deploy-sanity::
|
|
ifeq ($(BUILD_DEPLOY), true)
|
|
($(CD) $(DEPLOY_TOPDIR)/make && \
|
|
$(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS))
|
|
endif
|
|
|
|
.PHONY: deploy deploy-build deploy-clobber deploy-sanity
|
|
|