e487e25584
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
98 lines
2.8 KiB
Makefile
98 lines
2.8 KiB
Makefile
#
|
|
# Copyright 2004-2008 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.
|
|
#
|
|
|
|
#
|
|
# Makefile for building jconsole
|
|
#
|
|
|
|
BUILDDIR = ../..
|
|
PACKAGE = sun.tools.jconsole
|
|
PRODUCT = sun
|
|
include $(BUILDDIR)/common/Defs.gmk
|
|
|
|
# This program must contain a manifest that defines the execution level
|
|
# needed to follow standard Vista User Access Control Guidelines
|
|
# This must be set before Program.gmk is included
|
|
#
|
|
BUILD_MANIFEST=true
|
|
|
|
|
|
JARFILE = $(LIBDIR)/jconsole.jar
|
|
|
|
OTHER_JAVACFLAGS += -encoding iso8859-1
|
|
|
|
#
|
|
# Files
|
|
#
|
|
include FILES.gmk
|
|
|
|
AUTO_FILES_JAVA_DIRS = sun/tools/jconsole \
|
|
com/sun/tools/jconsole
|
|
|
|
FILES_png = $(PNG_FILES:%.png=$(CLASSBINDIR)/%.png)
|
|
FILES_gif = $(GIF_FILES:%.gif=$(CLASSBINDIR)/%.gif)
|
|
|
|
build: $(GENSRCDIR)/sun/tools/jconsole/Version.java
|
|
|
|
#
|
|
# Resources
|
|
#
|
|
LOCALE_SET_DEFINITION = jdk
|
|
RESOURCE_BUNDLES_JAVA = $(PKGDIR)/resources/JConsoleResources.java
|
|
|
|
#
|
|
# Rules.
|
|
#
|
|
include $(BUILDDIR)/common/Classes.gmk
|
|
|
|
build: $(FILES_png) $(FILES_gif) $(TEMPDIR)/manifest $(JARFILE)
|
|
|
|
$(GENSRCDIR)/sun/tools/jconsole/Version.java: \
|
|
$(SHARE_SRC)/classes/sun/tools/jconsole/Version-template.java
|
|
$(MKDIR) -p $(@D)
|
|
$(SED) -e 's/@@jconsole_version@@/$(FULL_VERSION)/g' $< > $@
|
|
|
|
$(CLASSBINDIR)/$(PKGDIR)/resources/%: $(SHARE_SRC)/classes/$(PKGDIR)/resources/%
|
|
@$(MKDIR) -p $(@D)
|
|
$(install-file)
|
|
|
|
$(TEMPDIR)/manifest: $(SHARE_SRC)/classes/$(PKGDIR)/manifest
|
|
$(install-file)
|
|
|
|
#
|
|
# Extra rule to build jconsole.jar
|
|
#
|
|
|
|
$(JARFILE): $(LIBDIR) $(FILES_class) $(FILES_png) $(FILES_gif) $(TEMPDIR)/manifest
|
|
$(BOOT_JAR_CMD) -cfm $(JARFILE) $(TEMPDIR)/manifest \
|
|
-C $(CLASSBINDIR) sun/tools/jconsole \
|
|
-C $(CLASSBINDIR) com/sun/tools/jconsole \
|
|
$(BOOT_JAR_JFLAGS)
|
|
@$(java-vm-cleanup)
|
|
|
|
clean clobber::
|
|
$(RM) $(TEMPDIR)/manifest $(JARFILE)
|
|
|