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
175 lines
4.8 KiB
Makefile
175 lines
4.8 KiB
Makefile
#
|
|
# Copyright 2003-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 Pack200
|
|
#
|
|
|
|
BUILDDIR = ../../../..
|
|
PACKAGE = com.sun.java.util.jar.pack
|
|
LIBRARY = unpack
|
|
PRODUCT = sun
|
|
PGRM = unpack200
|
|
include $(BUILDDIR)/common/Defs.gmk
|
|
|
|
CPLUSPLUSLIBRARY=true
|
|
|
|
FILES_m = mapfile-vers
|
|
include $(BUILDDIR)/common/Mapfile-vers.gmk
|
|
|
|
#
|
|
# Files to compile
|
|
#
|
|
AUTO_FILES_JAVA_DIRS = com/sun/java/util/jar/pack
|
|
|
|
include FILES_cpp.gmk
|
|
|
|
FILES_export = $(PKGDIR)/NativeUnpack.java
|
|
|
|
#
|
|
# Rules
|
|
include $(BUILDDIR)/common/Library.gmk
|
|
|
|
build: unpacker
|
|
|
|
vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
|
|
|
|
|
|
|
|
|
|
|
|
ifeq ($(STANDALONE),true)
|
|
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
|
|
|
|
ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/zadler32.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/zutil.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/inflate.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/infblock.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/infcodes.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/inftrees.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
|
|
$(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
|
|
|
|
ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
|
OTHER_CXXFLAGS += $(ZINCLUDE)
|
|
LDDFLAGS += $(ZIPOBJS)
|
|
else
|
|
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
|
|
OTHER_LDLIBS += $(JVMLIB)
|
|
endif
|
|
|
|
CXXFLAGS_DBG += -DFULL
|
|
CXXFLAGS_OPT += -DPRODUCT
|
|
CXXFLAGS_COMMON += -DFULL
|
|
|
|
ifeq ($(PLATFORM), windows)
|
|
CXXFLAGS_COMMON += $(MS_RUNTIME_OPTION)
|
|
LDOUTPUT = -Fe
|
|
|
|
# JDK name required here
|
|
RC_FLAGS += /D "JDK_FNAME=$(PGRM).exe" \
|
|
/D "JDK_INTERNAL_NAME=$(PGRM)" \
|
|
/D "JDK_FTYPE=0x1L"
|
|
|
|
RES = $(OBJDIR)/$(PGRM).res
|
|
else
|
|
LDOUTPUT = -o #Have a space
|
|
LDDFLAGS += -lc
|
|
OTHER_LDLIBS += $(LIBCXX)
|
|
# setup the list of libraries to link in...
|
|
ifeq ($(PLATFORM), linux)
|
|
ifeq ("$(CC_VER_MAJOR)", "3")
|
|
OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
|
|
endif
|
|
endif #LINUX
|
|
endif #PLATFORM
|
|
|
|
UNPACK_EXE = $(BINDIR)/unpack200$(EXE_SUFFIX)
|
|
|
|
UNPACK_EXE_FILES_cpp = $(filter-out jni.cpp,$(FILES_cpp))
|
|
|
|
UNPACK_EXE_FILES_cpp += main.cpp
|
|
|
|
UNPACK_EXE_FILES_o = $(addprefix $(COBJDIR)/, \
|
|
$(notdir \
|
|
$(patsubst %.cpp,%.$(OBJECT_SUFFIX),$(UNPACK_EXE_FILES_cpp)) \
|
|
))
|
|
|
|
COBJDIR = $(strip $(subst unpack,unpack-cmd,$(OBJDIR)))
|
|
|
|
all: build
|
|
|
|
build: prop
|
|
|
|
prop:
|
|
$(MAKE) -C prop
|
|
|
|
unpacker:
|
|
$(MAKE) $(UNPACK_EXE) STANDALONE=true LDMAPFLAGS_OPT= LDMAPFLAGS_DBG=
|
|
|
|
ifeq ($(PLATFORM), windows)
|
|
IMVERSIONVALUE=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
|
|
SED_ALL_MANIFEST=$(SED) -e 's%IMVERSION%$(IMVERSIONVALUE)%g'
|
|
updatefiles::
|
|
$(CAT) $(TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest | $(SED_ALL_MANIFEST) > $(OBJDIR)/unpack200.exe.manifest
|
|
winres:: $(RES)
|
|
else
|
|
updatefiles::
|
|
$(ECHO) "Manifest not required for Unix"
|
|
winres::
|
|
$(ECHO) "Resource files not required for Unix"
|
|
endif
|
|
|
|
$(UNPACK_EXE): $(UNPACK_EXE_FILES_o) updatefiles winres
|
|
$(prep-target)
|
|
$(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
|
|
ifdef MT
|
|
$(MT) /manifest $(TEMPDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
|
|
endif
|
|
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
|
|
|
|
ifeq ($(PLATFORM), windows)
|
|
$(RES):: $(VERSIONINFO_RESOURCE)
|
|
$(prep-target)
|
|
$(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
|
|
endif
|
|
|
|
$(COBJDIR)/%.$(OBJECT_SUFFIX): %.cpp
|
|
$(prep-target)
|
|
$(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$(COBJDIR)/$*.$(OBJECT_SUFFIX) $<
|
|
|
|
#
|
|
# Clean up.
|
|
#
|
|
clean::
|
|
$(RM) -r $(CLASSDESTDIR)/com/sun/java/util/jar/pack $(TEMPDIR)
|
|
$(RM) -r $(OUTPUTDIR)/tmp/$(PRODUCT)/$(PACKAGE)
|
|
$(MAKE) -C prop clean
|
|
|
|
.PHONY: unpacker clean winres prop
|