Thu, 11 Jun 2009 15:15:49 -0400
6797688: Umbrella: Merge all JDK 6u4 - 6u12 deployment code into JDK7
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
Summary: Initial changeset for implementing 6uX Deployment Features into JDK7
Reviewed-by: dgu, billyh
duke@2 | 1 | # |
duke@2 | 2 | # Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. |
duke@2 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@2 | 4 | # |
duke@2 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@2 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@2 | 7 | # published by the Free Software Foundation. Sun designates this |
duke@2 | 8 | # particular file as subject to the "Classpath" exception as provided |
duke@2 | 9 | # by Sun in the LICENSE file that accompanied this code. |
duke@2 | 10 | # |
duke@2 | 11 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@2 | 12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@2 | 13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@2 | 14 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@2 | 15 | # accompanied this code). |
duke@2 | 16 | # |
duke@2 | 17 | # You should have received a copy of the GNU General Public License version |
duke@2 | 18 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@2 | 19 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@2 | 20 | # |
duke@2 | 21 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@2 | 22 | # CA 95054 USA or visit www.sun.com if you need additional information or |
duke@2 | 23 | # have any questions. |
duke@2 | 24 | # |
duke@2 | 25 | |
duke@2 | 26 | ################################################################ |
duke@2 | 27 | # DEPLOY TARGETS |
duke@2 | 28 | ################################################################ |
duke@2 | 29 | |
duke@2 | 30 | deploy: deploy-build |
herrick@94 | 31 | |
herrick@94 | 32 | DEPLOY = deploy |
herrick@94 | 33 | |
herrick@94 | 34 | BUILD_DEPLOY=true |
herrick@94 | 35 | |
herrick@94 | 36 | ifeq ($(ARCH), ia64) |
herrick@94 | 37 | BUILD_DEPLOY=false |
duke@2 | 38 | endif |
duke@2 | 39 | |
herrick@94 | 40 | ifeq ($(ARCH), sparcv9) |
herrick@94 | 41 | BUILD_DEPLOY=false; |
herrick@94 | 42 | endif |
herrick@94 | 43 | |
herrick@94 | 44 | ifeq ($(ARCH), amd64) |
herrick@94 | 45 | ifeq ($(PLATFORM), solaris) |
herrick@94 | 46 | BUILD_DEPLOY=false |
herrick@94 | 47 | endif |
herrick@94 | 48 | endif |
herrick@94 | 49 | |
duke@2 | 50 | |
duke@2 | 51 | # put the generated bundles in their own place in OUTPUTDIR |
duke@2 | 52 | DEPLOY_OUTPUTDIR = $(ABS_OUTPUTDIR) |
duke@2 | 53 | |
duke@2 | 54 | # NO_IMAGES may be set in conjunction with DEV_ONLY |
duke@2 | 55 | ifdef NO_IMAGES |
duke@2 | 56 | IMAGES_TARGET = |
duke@2 | 57 | else |
duke@2 | 58 | IMAGES_TARGET = images |
duke@2 | 59 | endif |
duke@2 | 60 | |
herrick@94 | 61 | DEPLOY_BUILD_TARGETS = sanity javaws-all plugin-all |
herrick@94 | 62 | # Only build 7-Zip LZMA file compression if it is available |
herrick@94 | 63 | # Enable 7-Zip LZMA file (de)compression for Java Kernel if it is available |
herrick@94 | 64 | ifeq ($(ARCH_DATA_MODEL), 32) |
herrick@94 | 65 | ifeq ($(PLATFORM), windows) |
herrick@94 | 66 | ifneq ($(KERNEL), off) |
herrick@94 | 67 | EC_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/lzma ] ; then \ |
herrick@94 | 68 | $(ECHO) true ; \ |
herrick@94 | 69 | else \ |
herrick@94 | 70 | $(ECHO) false ; \ |
herrick@94 | 71 | fi ) |
herrick@94 | 72 | ifeq ($(EC_TMP), true) |
herrick@94 | 73 | DEPLOY_BUILD_TARGETS += extra-comp-all |
herrick@94 | 74 | endif |
herrick@94 | 75 | endif |
herrick@94 | 76 | endif |
herrick@94 | 77 | endif |
herrick@94 | 78 | |
herrick@94 | 79 | ifneq ($(JQS), off) |
herrick@94 | 80 | ifeq ($(ARCH_DATA_MODEL), 32) |
herrick@94 | 81 | ifeq ($(PLATFORM), windows) |
herrick@94 | 82 | DEPLOY_BUILD_TARGETS += jqs-all |
herrick@94 | 83 | endif |
herrick@94 | 84 | endif |
herrick@94 | 85 | endif |
herrick@94 | 86 | |
herrick@94 | 87 | ifneq ($(KERNEL), off) |
herrick@94 | 88 | ifeq ($(ARCH_DATA_MODEL), 32) |
herrick@94 | 89 | ifeq ($(PLATFORM), windows) |
herrick@94 | 90 | # Only set up to use UPX compression if it is available |
herrick@94 | 91 | UP_TMP = $(shell if [ -d $(DEPLOY_TOPDIR)/make/upx ] ; then \ |
herrick@94 | 92 | $(ECHO) true ; \ |
herrick@94 | 93 | else \ |
herrick@94 | 94 | $(ECHO) false ; \ |
herrick@94 | 95 | fi ) |
herrick@94 | 96 | ifeq ($(UP_TMP), true) |
herrick@94 | 97 | DEPLOY_BUILD_TARGETS += cmd-comp-all |
herrick@94 | 98 | endif |
herrick@94 | 99 | DEPLOY_BUILD_TARGETS += kernel-all |
herrick@94 | 100 | endif |
herrick@94 | 101 | endif |
herrick@94 | 102 | endif |
herrick@94 | 103 | |
herrick@94 | 104 | |
herrick@94 | 105 | |
duke@2 | 106 | ifndef DEV_ONLY |
duke@2 | 107 | DEPLOY_BUILD_TARGETS += images |
duke@2 | 108 | else |
duke@2 | 109 | DEPLOY_BUILD_TARGETS += $(IMAGES_TARGET) |
duke@2 | 110 | endif |
duke@2 | 111 | |
duke@2 | 112 | DEPLOY_BUILD_ARGUMENTS = $(COMMON_BUILD_ARGUMENTS) \ |
duke@2 | 113 | ALT_OUTPUTDIR=$(DEPLOY_OUTPUTDIR) |
duke@2 | 114 | |
duke@2 | 115 | ifeq ($(BUILD_LANGTOOLS), true) |
duke@2 | 116 | DEPLOY_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) |
duke@2 | 117 | endif |
duke@2 | 118 | |
duke@2 | 119 | ifdef ALT_IMAGE_DIR |
duke@2 | 120 | DEPLOY_BUILD_ARGUMENTS += ALT_IMAGE_DIR=$(ALT_IMAGE_DIR) |
duke@2 | 121 | endif |
duke@2 | 122 | |
duke@2 | 123 | ifdef ALT_BUNDLE_DATE |
duke@2 | 124 | DEPLOY_BUILD_ARGUMENTS += ALT_BUNDLE_DATE=$(ALT_BUNDLE_DATE) |
duke@2 | 125 | endif |
duke@2 | 126 | |
duke@2 | 127 | ifdef ALT_JAVAWS_BOOTDIR |
duke@2 | 128 | DEPLOY_BUILD_ARGUMENTS += ALT_JAVAWS_BOOTDIR=$(ALT_JAVAWS_BOOTDIR) |
duke@2 | 129 | endif |
duke@2 | 130 | |
duke@2 | 131 | ifdef CERT |
duke@2 | 132 | DEPLOY_BUILD_ARGUMENTS += CERT=$(CERT) |
duke@2 | 133 | endif |
duke@2 | 134 | |
duke@2 | 135 | ifdef PKEY |
duke@2 | 136 | DEPLOY_BUILD_ARGUMENTS += PKEY=$(PKEY) |
duke@2 | 137 | endif |
duke@2 | 138 | |
duke@2 | 139 | deploy-build: |
herrick@94 | 140 | ifeq ($(BUILD_DEPLOY), true) |
duke@2 | 141 | ($(CD) $(DEPLOY_TOPDIR)/make && \ |
herrick@94 | 142 | $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) |
duke@2 | 143 | endif |
duke@2 | 144 | |
duke@2 | 145 | deploy-clobber:: |
herrick@94 | 146 | ifeq ($(BUILD_DEPLOY), true) |
duke@2 | 147 | ($(CD) $(DEPLOY_TOPDIR)/make && \ |
herrick@94 | 148 | $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) |
duke@2 | 149 | endif |
duke@2 | 150 | |
duke@2 | 151 | deploy-sanity:: |
herrick@94 | 152 | ifeq ($(BUILD_DEPLOY), true) |
duke@2 | 153 | ($(CD) $(DEPLOY_TOPDIR)/make && \ |
herrick@94 | 154 | $(MAKE) sanity $(DEPLOY_BUILD_ARGUMENTS)) |
duke@2 | 155 | endif |
duke@2 | 156 | |
duke@2 | 157 | .PHONY: deploy deploy-build deploy-clobber deploy-sanity |
duke@2 | 158 |