Thu, 11 Jun 2009 15:16:20 -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@1 | 1 | # |
duke@1 | 2 | # Copyright 1995-2005 Sun Microsystems, Inc. All Rights Reserved. |
duke@1 | 3 | # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@1 | 4 | # |
duke@1 | 5 | # This code is free software; you can redistribute it and/or modify it |
duke@1 | 6 | # under the terms of the GNU General Public License version 2 only, as |
duke@1 | 7 | # published by the Free Software Foundation. Sun designates this |
duke@1 | 8 | # particular file as subject to the "Classpath" exception as provided |
duke@1 | 9 | # by Sun in the LICENSE file that accompanied this code. |
duke@1 | 10 | # |
duke@1 | 11 | # This code is distributed in the hope that it will be useful, but WITHOUT |
duke@1 | 12 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@1 | 13 | # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@1 | 14 | # version 2 for more details (a copy is included in the LICENSE file that |
duke@1 | 15 | # accompanied this code). |
duke@1 | 16 | # |
duke@1 | 17 | # You should have received a copy of the GNU General Public License version |
duke@1 | 18 | # 2 along with this work; if not, write to the Free Software Foundation, |
duke@1 | 19 | # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@1 | 20 | # |
duke@1 | 21 | # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@1 | 22 | # CA 95054 USA or visit www.sun.com if you need additional information or |
duke@1 | 23 | # have any questions. |
duke@1 | 24 | # |
duke@1 | 25 | |
duke@1 | 26 | include $(BUILDDIR)/common/Rules.gmk |
duke@1 | 27 | |
duke@1 | 28 | # |
duke@1 | 29 | # Say you built classes into $(ALT_CLASSBINDIR) and then at the end of |
duke@1 | 30 | # the build you might want to copy them over to $(ALT_CLASSDESTDIR); |
duke@1 | 31 | # this rule takes care of that. No one should really set these |
duke@1 | 32 | # variables except the bootstrap/recompile stage of the java compiler. |
duke@1 | 33 | # |
duke@1 | 34 | ifdef ALT_CLASSBINDIR |
duke@1 | 35 | |
duke@1 | 36 | # By default post-processing is copying. Suppose you want to build |
duke@1 | 37 | # a jar file then set ALT_CLASSES_DISPOSITION to '../../dest/nameof.jar' |
duke@1 | 38 | # before including this file. |
duke@1 | 39 | ifndef ALT_CLASSES_DISPOSITION |
duke@1 | 40 | ALT_CLASSES_DISPOSITION = copy-classes |
duke@1 | 41 | endif |
duke@1 | 42 | |
duke@1 | 43 | build : $(ALT_CLASSES_DISPOSITION) |
duke@1 | 44 | |
duke@1 | 45 | copy-classes: |
duke@1 | 46 | ifneq ($(ALT_CLASSBINDIR), $(ALT_CLASSDESTDIR)) |
duke@1 | 47 | @if [ -s $(TEMPDIR)/.classes.list ]; then \ |
duke@1 | 48 | $(MKDIR) -p $(ALT_CLASSDESTDIR); \ |
duke@1 | 49 | $(ECHO) "Copying $(ALT_CLASSBINDIR)..."; \ |
duke@1 | 50 | $(ECHO) "($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \ |
duke@1 | 51 | ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -)"; \ |
duke@1 | 52 | ($(CD) $(ALT_CLASSBINDIR); $(TAR) cf - .) | \ |
duke@1 | 53 | ($(CD) $(ALT_CLASSDESTDIR); $(TAR) xf -); \ |
duke@1 | 54 | fi |
duke@1 | 55 | else # ALT_CLASSBINDIR |
duke@1 | 56 | @if [ -s $(TEMPDIR)/.classes.list ]; then \ |
duke@1 | 57 | $(ECHO) "Copy source and destination are the same: $(ALT_CLASSBINDIR) -- Copy skipped..."; \ |
duke@1 | 58 | fi |
duke@1 | 59 | endif # ALT_CLASSBINDIR |
duke@1 | 60 | |
duke@1 | 61 | .PHONY: copy-classes |
duke@1 | 62 | endif # ALT_CLASSBINDIR |
duke@1 | 63 |