Merge
This commit is contained in:
Kelly O'Hair
commit
a70653025c
jdk
make
Makefile
com/sun/java/pack
common
java/redist
jdk_generic_profile.shsrc/share/demo/jvmti
@ -100,7 +100,6 @@ CACERTS_FILE.desc = Location of certificates file
|
||||
DEVTOOLS_PATH.desc = Directory containing zip and unzip
|
||||
CUPS_HEADERS_PATH.desc = Include directory location for CUPS header files
|
||||
DXSDK_PATH.desc = Root directory of DirectX SDK
|
||||
MSVCRT_DLL_PATH.desc = Directory containing mscvrt.dll
|
||||
|
||||
# Make variables to print out (description and value)
|
||||
VARIABLE_PRINTVAL_LIST += \
|
||||
@ -133,12 +132,10 @@ VARIABLE_CHECKFIL_LIST += \
|
||||
ifeq ($(PLATFORM), windows)
|
||||
|
||||
VARIABLE_PRINTVAL_LIST += \
|
||||
DXSDK_PATH \
|
||||
MSVCRT_DLL_PATH
|
||||
DXSDK_PATH
|
||||
|
||||
VARIABLE_CHECKDIR_LIST += \
|
||||
DXSDK_PATH \
|
||||
MSVCRT_DLL_PATH
|
||||
DXSDK_PATH
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@ -155,6 +155,7 @@ ifdef MT
|
||||
$(MT) /manifest $(OBJDIR)/unpack200$(EXE_SUFFIX).manifest /outputresource:$(TEMPDIR)/unpack200$(EXE_SUFFIX);#1
|
||||
endif
|
||||
$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
|
||||
@$(call binary_file_verification,$@)
|
||||
$(install-module-file)
|
||||
|
||||
ifeq ($(PLATFORM), windows)
|
||||
|
||||
@ -67,28 +67,27 @@ PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
|
||||
|
||||
# The following DLL's are considered MS runtime libraries and should
|
||||
# not to be REBASEd, see deploy/make/common/Release.gmk.
|
||||
# msvcrt.dll, msvcrnn.dll [msvcr71 or msvcr80 or msvcr90] : Microsoft runtimes
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll
|
||||
# msvcr*.dll: Microsoft runtimes
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
ifeq ($(COMPILER_VERSION), VS2003)
|
||||
MSVCRNN_DLL = msvcr71.dll
|
||||
MSVCPNN_DLL = msvcp71.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
|
||||
endif
|
||||
ifeq ($(COMPILER_VERSION), VS2005)
|
||||
MSVCRNN_DLL = msvcr80.dll
|
||||
MSVCPNN_DLL = msvcp80.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
|
||||
endif
|
||||
ifeq ($(COMPILER_VERSION), VS2008)
|
||||
MSVCRNN_DLL = msvcr90.dll
|
||||
MSVCPNN_DLL = msvcp90.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
|
||||
endif
|
||||
ifeq ($(COMPILER_VERSION), VS2010)
|
||||
MSVCRNN_DLL = msvcr100.dll
|
||||
MSVCPNN_DLL = msvcp100.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -96,12 +95,12 @@ ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
ifeq ($(COMPILER_VERSION), VS2008)
|
||||
MSVCRNN_DLL = msvcr90.dll
|
||||
MSVCPNN_DLL = msvcp90.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = msvcrt.dll $(MSVCRNN_DLL)
|
||||
endif
|
||||
ifeq ($(COMPILER_VERSION), VS2010)
|
||||
MSVCRNN_DLL = msvcr100.dll
|
||||
MSVCPNN_DLL = msvcp100.dll
|
||||
MS_RUNTIME_LIBRARIES += $(MSVCRNN_DLL)
|
||||
MS_RUNTIME_LIBRARIES = $(MSVCRNN_DLL)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -283,7 +282,7 @@ ifeq ($(MFC_DEBUG), true)
|
||||
MS_RUNTIME_OPTION=-MTd
|
||||
else
|
||||
# This MS debugging flag forces a dependence on the debug
|
||||
# version of the runtime library (MSVCRTD.DLL), as does -MDd.
|
||||
# version of the runtime library (MSVCR*D.DLL), as does -MDd.
|
||||
# We cannot re-distribute this debug runtime.
|
||||
MS_RUNTIME_OPTION=-MDd
|
||||
endif
|
||||
|
||||
@ -294,6 +294,7 @@ $(DEMO_LIBRARY): $(DEMO_FULL_OBJECTS)
|
||||
@$(prep-target)
|
||||
$(LINK.demo) $(SHARED_LIBRARY_FLAG) $(CC_PROGRAM_OUTPUT_FLAG)$@ \
|
||||
$(DEMO_FULL_OBJECTS) $(LDLIBS.demo)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
# Generation of any javah include file, make sure objects are dependent on it
|
||||
ifdef DEMO_NATIVECLASS
|
||||
|
||||
@ -167,6 +167,7 @@ $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
|
||||
$(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
|
||||
$(OTHER_LCF) $(JAVALIB) $(LDLIBS)
|
||||
$(CP) $(OBJDIR)/$(@F) $@
|
||||
@$(call binary_file_verification,$@)
|
||||
$(install-module-file)
|
||||
$(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
|
||||
$(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
|
||||
@ -233,6 +234,7 @@ ifeq ($(LIBRARY), fdlibm)
|
||||
$(AR) -r $@ $(FILES_o)
|
||||
else # LIBRARY
|
||||
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
|
||||
@$(call binary_file_verification,$@)
|
||||
$(install-module-file)
|
||||
ifeq ($(WRITE_LIBVERSION),true)
|
||||
$(MCS) -d -a "$(FULL_VERSION)" $@
|
||||
|
||||
@ -73,47 +73,20 @@ module-image-jdk:: initial-module-image-jdk trim-module-image-jdk process-module
|
||||
|
||||
#
|
||||
# Paths to these files we need
|
||||
JDK_MODULE_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
|
||||
JDK_MODULE_64_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%64)
|
||||
JDK_MODULE_DOCFILES = $(OTHER_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
|
||||
|
||||
JRE_MODULE_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
|
||||
JRE_MODULE_64_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%64)
|
||||
JRE_MODULE_DOCFILES = $(OTHER_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
|
||||
JRE_MODULE_DOCFILES += $(JRE_NAMECHANGE_DOCLIST:%=$(JRE_MODULE_IMAGE_DIR)/%$(TEXT_SUFFIX))
|
||||
JDK_MODULE_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_MODULE_IMAGE_DIR)/%)
|
||||
JRE_MODULE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_MODULE_IMAGE_DIR)/%)
|
||||
|
||||
###### RULES
|
||||
|
||||
# JDK files
|
||||
$(JDK_MODULE_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
# Removes LICENSE_VERSION or not
|
||||
ifdef LICENSE_VERSION
|
||||
$(JDK_MODULE_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
$(JDK_MODULE_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
else
|
||||
$(JDK_MODULE_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
endif
|
||||
|
||||
# JRE files
|
||||
$(JRE_MODULE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
# Add $(TEXT_SUFFIX) suffix
|
||||
ifdef TEXT_SUFFIX
|
||||
$(JRE_MODULE_IMAGE_DIR)/%$(TEXT_SUFFIX): $(SHARE_JRE_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
endif
|
||||
# Removes LICENSE_VERSION or not
|
||||
ifdef LICENSE_VERSION
|
||||
$(JRE_MODULE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
$(JRE_MODULE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
else
|
||||
$(JRE_MODULE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%
|
||||
ifeq ($(PLATFORM), windows)
|
||||
$(JRE_MODULE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README
|
||||
$(process-doc-file)
|
||||
endif
|
||||
|
||||
@ -157,8 +130,7 @@ initial-module-image-jre-setup:
|
||||
$(MKDIR) -p $(JRE_MODULE_IMAGE_DIR)
|
||||
|
||||
# 64-bit solaris jre image contains only the 64-bit add-on files.
|
||||
initial-module-image-jre-sol64:: initial-module-image-jre-setup \
|
||||
$(JRE_MODULE_LICENSES) $(JRE_MODULE_64_LICENSES)
|
||||
initial-module-image-jre-sol64:: initial-module-image-jre-setup
|
||||
@# Use tar instead of cp to preserve the symbolic links
|
||||
for dir in bin lib ; do \
|
||||
( $(CD) $(OUTPUTDIR) && \
|
||||
@ -174,7 +146,7 @@ initial-module-image-jre-sol64:: initial-module-image-jre-setup \
|
||||
|
||||
# Construct an initial jre image (initial jdk jre) no trimming or stripping
|
||||
initial-module-image-jre:: initial-module-image-jre-setup \
|
||||
$(JRE_LICENSES) $(JRE_MODULE_DOCFILES) \
|
||||
$(JRE_MODULE_DOCFILES) \
|
||||
$(BUILDMETAINDEX_JARFILE)
|
||||
@# Copy in bin directory
|
||||
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_MODULE_IMAGE_DIR)
|
||||
@ -310,8 +282,7 @@ initial-module-image-jdk64-bindemos:
|
||||
|
||||
# Solaris 64 bit image is special
|
||||
initial-module-image-jdk-sol64:: initial-module-image-jdk-setup \
|
||||
initial-module-image-jdk64-bindemos \
|
||||
$(JDK_MODULE_LICENSES) $(JDK_MODULARLIZED_64_LICENSES)
|
||||
initial-module-image-jdk64-bindemos
|
||||
|
||||
# DB files to add
|
||||
ifeq ($(OPENJDK),true)
|
||||
@ -335,7 +306,7 @@ endif
|
||||
# Standard jdk image
|
||||
initial-module-image-jdk:: initial-module-image-jdk-setup \
|
||||
initial-module-image-jdk-db \
|
||||
$(JDK_MODULE_LICENSES) $(JDK_MODULE_DOCFILES)
|
||||
$(JDK_MODULE_DOCFILES)
|
||||
$(MKDIR) $(JDK_MODULE_IMAGE_DIR)/lib
|
||||
@#
|
||||
@# copy jdk modules to jdk/lib
|
||||
|
||||
@ -160,6 +160,7 @@ $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LC
|
||||
ifdef MT
|
||||
$(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
|
||||
endif
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
else # PLATFORM
|
||||
|
||||
@ -184,6 +185,7 @@ $(ACTUAL_PROGRAM):: $(FILES_o)
|
||||
@$(MKDIR) -p $(TEMPDIR)
|
||||
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
|
||||
$(FILES_o) $(THREADLIBS) $(LDLIBS)
|
||||
@$(call binary_file_verification,$@)
|
||||
$(install-module-file)
|
||||
|
||||
endif # PLATFORM
|
||||
|
||||
@ -26,6 +26,9 @@
|
||||
include $(JDK_TOPDIR)/make/docs/CORE_PKGS.gmk
|
||||
include $(JDK_TOPDIR)/make/docs/NON_CORE_PKGS.gmk
|
||||
|
||||
# What jdk version are we building
|
||||
THIS_JDK_VERSION := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
|
||||
|
||||
#
|
||||
# Perform release engineering tasks.
|
||||
#
|
||||
@ -72,14 +75,6 @@ endif
|
||||
|
||||
JTG_DOCS = $(JDK_TOPDIR)/src/solaris/doc
|
||||
|
||||
#We use this for man page header
|
||||
jdkversion := $(JDK_MAJOR_VERSION).$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION)
|
||||
|
||||
# Text documents on windows use this suffix
|
||||
ifeq ($(PLATFORM), windows)
|
||||
TEXT_SUFFIX = .txt
|
||||
endif
|
||||
|
||||
# The base names of all the license and document files for the jdk and jre
|
||||
# (These files get placed in the jdk and jre install images)
|
||||
ifdef OPENJDK
|
||||
@ -87,48 +82,24 @@ ifdef OPENJDK
|
||||
SHARE_JDK_DOC_SRC = $(JDK_TOPDIR)
|
||||
SHARE_JRE_DOC_SRC = $(JDK_TOPDIR)
|
||||
# Same files for jdk and jre, no name changes
|
||||
LICENSE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION
|
||||
LICENSE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION
|
||||
OTHER_DOCLIST_JDK = THIRD_PARTY_README
|
||||
OTHER_DOCLIST_JRE = THIRD_PARTY_README
|
||||
IMAGE_DOCLIST_JDK = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||
IMAGE_DOCLIST_JRE = LICENSE ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||
else
|
||||
# Where to find these files
|
||||
SHARE_JDK_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jdk
|
||||
SHARE_JRE_DOC_SRC = $(CLOSED_SHARE_SRC)/doc/jre
|
||||
# Select the pre-release or FCS license version based on the build milestone.
|
||||
LICENSE_VERSION=.pre
|
||||
ifeq ($(MILESTONE), fcs)
|
||||
LICENSE_VERSION=.fcs
|
||||
endif
|
||||
IMAGE_DOCLIST_JDK = COPYRIGHT README.html THIRDPARTYLICENSEREADME.txt
|
||||
IMAGE_DOCLIST_JRE = COPYRIGHT Welcome.html THIRDPARTYLICENSEREADME.txt
|
||||
ifeq ($(PLATFORM), windows)
|
||||
LICENSE_DOCLIST_JDK = $(subst $(LICENSE_VERSION),,\
|
||||
$(shell $(CD) $(SHARE_JDK_DOC_SRC) && \
|
||||
$(LS) *LICENSE*$(LICENSE_VERSION)))
|
||||
LICENSE_DOCLIST_JRE = $(subst $(LICENSE_VERSION),,\
|
||||
$(shell $(CD) $(SHARE_JRE_DOC_SRC) && \
|
||||
$(LS) *LICENSE*$(LICENSE_VERSION)))
|
||||
IMAGE_DOCLIST_JRE += README.txt
|
||||
else
|
||||
LICENSE_DOCLIST_JDK = $(subst $(LICENSE_VERSION),,\
|
||||
$(shell $(CD) $(SHARE_JDK_DOC_SRC) && \
|
||||
$(LS) *LICENSE*$(LICENSE_VERSION) | $(GREP) -v rtf))
|
||||
LICENSE_DOCLIST_JRE = $(subst $(LICENSE_VERSION),,\
|
||||
$(shell $(CD) $(SHARE_JRE_DOC_SRC) && \
|
||||
$(LS) *LICENSE*$(LICENSE_VERSION) | $(GREP) -v rtf))
|
||||
IMAGE_DOCLIST_JRE += README
|
||||
endif
|
||||
OTHER_DOCLIST_JDK = COPYRIGHT README.html README_ja.html README_zh_CN.html
|
||||
OTHER_DOCLIST_JRE = COPYRIGHT Welcome.html
|
||||
JRE_NAMECHANGE_DOCLIST = README
|
||||
endif
|
||||
|
||||
# Paths to these files we need
|
||||
JDK_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
|
||||
JDK64_LICENSES = $(LICENSE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%64)
|
||||
JDK_DOCFILES = $(OTHER_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
|
||||
|
||||
JRE_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
|
||||
JRE64_LICENSES = $(LICENSE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%64)
|
||||
JRE_DOCFILES = $(OTHER_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
|
||||
JRE_DOCFILES += $(JRE_NAMECHANGE_DOCLIST:%=$(JRE_IMAGE_DIR)/%$(TEXT_SUFFIX))
|
||||
JDK_DOCFILES = $(IMAGE_DOCLIST_JDK:%=$(JDK_IMAGE_DIR)/%)
|
||||
JRE_DOCFILES = $(IMAGE_DOCLIST_JRE:%=$(JRE_IMAGE_DIR)/%)
|
||||
|
||||
# absolute directory names: note, these must exist prior to build
|
||||
# time - they are created in the main Makefile.
|
||||
@ -213,7 +184,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
|
||||
$(MKDIR) -p $1/man/$${ja_dir}/man1; \
|
||||
$(CAT) $${manbase}/ja/$${manpage} \
|
||||
| $(NATIVE2ASCII) -encoding $(JA_SOURCE_ENCODING) \
|
||||
| $(SED) 's/@@VERSION@@/$(jdkversion)/g' \
|
||||
| $(SED) 's/@@VERSION@@/$(THIS_JDK_VERSION)/g' \
|
||||
| $(NATIVE2ASCII) -reverse -encoding $${ja_encoding} \
|
||||
> $1/man/$${ja_dir}/man1/$${manpage}; \
|
||||
done; \
|
||||
@ -243,6 +214,7 @@ images images-clobber \
|
||||
initial-image-jre initial-image-jdk \
|
||||
initial-image-jre-sol64 initial-image-jdk-sol64 \
|
||||
trim-image-jre trim-image-jdk \
|
||||
identify-image-jre identify-image-jdk \
|
||||
process-image-jre process-image-jdk \
|
||||
compare-image \
|
||||
sec-files sec-files-win jgss-files ::
|
||||
@ -252,11 +224,12 @@ sec-files sec-files-win jgss-files ::
|
||||
images:: sanity-images post-sanity-images \
|
||||
$(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
|
||||
trim-image-jre trim-image-jdk \
|
||||
identify-image-jre identify-image-jdk \
|
||||
process-image-jre process-image-jdk sec-files sec-files-win jgss-files
|
||||
|
||||
# Don't use these
|
||||
image-jre:: initial-image-jre trim-image-jre process-image-jre
|
||||
image-jdk:: initial-image-jdk trim-image-jdk process-image-jdk
|
||||
image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
|
||||
image-jdk:: initial-image-jdk trim-image-jdk identify-image-jdk process-image-jdk
|
||||
|
||||
#
|
||||
# Sources we ship in the SDK.
|
||||
@ -503,33 +476,12 @@ endef
|
||||
# JDK files
|
||||
$(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
# Removes LICENSE_VERSION or not
|
||||
ifdef LICENSE_VERSION
|
||||
$(JDK_IMAGE_DIR)/%: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
$(JDK_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
else
|
||||
$(JDK_IMAGE_DIR)/%64: $(SHARE_JDK_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
endif
|
||||
|
||||
# JRE files
|
||||
$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
# Add $(TEXT_SUFFIX) suffix
|
||||
ifdef TEXT_SUFFIX
|
||||
$(JRE_IMAGE_DIR)/%$(TEXT_SUFFIX): $(SHARE_JRE_DOC_SRC)/%
|
||||
$(process-doc-file)
|
||||
endif
|
||||
# Removes LICENSE_VERSION or not
|
||||
ifdef LICENSE_VERSION
|
||||
$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
$(JRE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%$(LICENSE_VERSION)
|
||||
$(process-doc-file)
|
||||
else
|
||||
$(JRE_IMAGE_DIR)/%64: $(SHARE_JRE_DOC_SRC)/%
|
||||
ifeq ($(PLATFORM), windows)
|
||||
$(JRE_IMAGE_DIR)/README.txt: $(SHARE_JRE_DOC_SRC)/README
|
||||
$(process-doc-file)
|
||||
endif
|
||||
|
||||
@ -737,8 +689,7 @@ initial-image-jre-setup:
|
||||
$(MKDIR) -p $(JRE_IMAGE_DIR)
|
||||
|
||||
# 64-bit solaris jre image contains only the 64-bit add-on files.
|
||||
initial-image-jre-sol64:: initial-image-jre-setup \
|
||||
$(JRE_LICENSES) $(JRE64_LICENSES)
|
||||
initial-image-jre-sol64:: initial-image-jre-setup
|
||||
@# Use tar instead of cp to preserve the symbolic links
|
||||
for dir in bin lib ; do \
|
||||
( $(CD) $(OUTPUTDIR) && \
|
||||
@ -759,7 +710,7 @@ initial-image-jre-sol64:: initial-image-jre-setup \
|
||||
# See "initial-image-jdk-setup" for an explanation of the rm of
|
||||
# drive names like C:
|
||||
initial-image-jre:: initial-image-jre-setup \
|
||||
$(JRE_LICENSES) $(JRE_DOCFILES) \
|
||||
$(JRE_DOCFILES) \
|
||||
$(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) \
|
||||
$(BUILDMETAINDEX_JARFILE)
|
||||
@# Copy in bin directory
|
||||
@ -835,11 +786,14 @@ else # PLATFORM
|
||||
endif
|
||||
endif # PLATFORM
|
||||
|
||||
# Get list of all Elf files in the jre
|
||||
JRE_ELF_LIST=$(TEMPDIR)/jre-elf-files.list
|
||||
$(JRE_ELF_LIST):
|
||||
ifneq ($(PLATFORM), windows)
|
||||
# Get list of all binary (COFF or Elf) files in the jre
|
||||
JRE_BIN_LIST=$(TEMPDIR)/jre-bin-files.list
|
||||
$(JRE_BIN_LIST):
|
||||
$(RM) $@
|
||||
ifeq ($(PLATFORM), windows)
|
||||
$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*.exe \
|
||||
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
|
||||
else
|
||||
$(FIND) $(JRE_IMAGE_DIR)/lib -type f -name \*.$(LIB_SUFFIX) >> $@
|
||||
$(FILE) `$(FIND) $(JRE_IMAGE_DIR)/bin -type f -name \*$(EXE_SUFFIX)` \
|
||||
| $(EGREP) 'ELF' | $(CUT) -d':' -f1 >> $@
|
||||
@ -847,9 +801,9 @@ endif
|
||||
|
||||
# Post process the image (strips and mcs on Elf files we are shipping)
|
||||
# (Note the jdk WILL want the jre image before this processing)
|
||||
process-image-jre:: $(JRE_ELF_LIST)
|
||||
process-image-jre:: $(JRE_BIN_LIST)
|
||||
ifneq ($(POST_STRIP_PROCESS), )
|
||||
for f in `$(CAT) $(JRE_ELF_LIST)`; do \
|
||||
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
|
||||
$(CHMOD) u+w $${f}; \
|
||||
$(ECHO) $(POST_STRIP_PROCESS) $${f}; \
|
||||
$(POST_STRIP_PROCESS) $${f}; \
|
||||
@ -857,14 +811,17 @@ ifneq ($(POST_STRIP_PROCESS), )
|
||||
done
|
||||
endif
|
||||
ifneq ($(POST_MCS_PROCESS), )
|
||||
for f in `$(CAT) $(JRE_ELF_LIST)`; do \
|
||||
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
|
||||
$(CHMOD) u+w $${f}; \
|
||||
$(ECHO) $(POST_MCS_PROCESS) $${f}; \
|
||||
$(POST_MCS_PROCESS) $${f}; \
|
||||
$(CHMOD) go-w $${f}; \
|
||||
done
|
||||
endif
|
||||
$(RM) $(JRE_ELF_LIST)
|
||||
@for f in `$(CAT) $(JRE_BIN_LIST)`; do \
|
||||
$(call binary_file_verification,$${f}); \
|
||||
done
|
||||
$(RM) $(JRE_BIN_LIST)
|
||||
|
||||
######################################################
|
||||
# JDK Image
|
||||
@ -904,8 +861,7 @@ initial-image-jdk64-bindemos:
|
||||
|
||||
# Solaris 64 bit image is special
|
||||
initial-image-jdk-sol64:: initial-image-jdk-setup \
|
||||
initial-image-jdk64-bindemos \
|
||||
$(JDK_LICENSES) $(JDK64_LICENSES)
|
||||
initial-image-jdk64-bindemos
|
||||
|
||||
# DB files to add
|
||||
ifdef OPENJDK
|
||||
@ -929,7 +885,7 @@ endif
|
||||
# Standard jdk image
|
||||
initial-image-jdk:: initial-image-jdk-setup \
|
||||
initial-image-jdk-db \
|
||||
$(JDK_LICENSES) $(JDK_DOCFILES)
|
||||
$(JDK_DOCFILES)
|
||||
$(MKDIR) $(JDK_IMAGE_DIR)/lib
|
||||
@#
|
||||
@# Copy in the jars in lib that only belong in the JDK
|
||||
@ -1091,10 +1047,15 @@ trim-image-jdk::
|
||||
$(RM) $(JDK_IMAGE_DIR)/bin/$${t}$(EXE_SUFFIX); \
|
||||
done
|
||||
|
||||
# Get list of Elf files in the jdk
|
||||
JDK_ELF_LIST=$(TEMPDIR)/jdk-elf-files.list
|
||||
$(JDK_ELF_LIST):
|
||||
ifneq ($(PLATFORM), windows)
|
||||
# Get list of binary (COFF or Elf) files in the jdk
|
||||
JDK_BIN_LIST=$(TEMPDIR)/jdk-bin-files.list
|
||||
$(JDK_BIN_LIST):
|
||||
ifeq ($(PLATFORM), windows)
|
||||
$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*.exe \
|
||||
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" > $@
|
||||
$(FIND) $(JDK_IMAGE_DIR)/bin -type f -name \*.exe \
|
||||
-o -name \*.dll | $(EGREP) -v -i "$(MSVCRNN_DLL)" >> $@
|
||||
else
|
||||
$(RM) $@
|
||||
$(FIND) $(JDK_IMAGE_DIR)/jre/lib -type f -name \*.$(LIB_SUFFIX) >> $@
|
||||
$(FILE) `$(FIND) $(JDK_IMAGE_DIR)/jre/bin -type f -name \*$(EXE_SUFFIX)` \
|
||||
@ -1104,9 +1065,9 @@ ifneq ($(PLATFORM), windows)
|
||||
endif
|
||||
|
||||
# Post process the image (strips and mcs on files we are shipping)
|
||||
process-image-jdk:: $(JDK_ELF_LIST)
|
||||
process-image-jdk:: $(JDK_BIN_LIST)
|
||||
ifneq ($(POST_STRIP_PROCESS), )
|
||||
for f in `$(CAT) $(JDK_ELF_LIST)`; do \
|
||||
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
|
||||
$(CHMOD) u+w $${f}; \
|
||||
$(ECHO) $(POST_STRIP_PROCESS) $${f}; \
|
||||
$(POST_STRIP_PROCESS) $${f}; \
|
||||
@ -1114,14 +1075,56 @@ ifneq ($(POST_STRIP_PROCESS), )
|
||||
done
|
||||
endif
|
||||
ifneq ($(POST_MCS_PROCESS), )
|
||||
for f in `$(CAT) $(JDK_ELF_LIST)`; do \
|
||||
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
|
||||
$(CHMOD) u+w $${f}; \
|
||||
$(ECHO) $(POST_MCS_PROCESS) $${f}; \
|
||||
$(POST_MCS_PROCESS) $${f}; \
|
||||
$(CHMOD) go-w $${f}; \
|
||||
done
|
||||
endif
|
||||
$(RM) $(JDK_ELF_LIST)
|
||||
@for f in `$(CAT) $(JDK_BIN_LIST)`; do \
|
||||
$(call binary_file_verification,$${f}); \
|
||||
done
|
||||
$(RM) $(JDK_BIN_LIST)
|
||||
|
||||
###################################################################
|
||||
# What did we build
|
||||
###################################################################
|
||||
|
||||
# The jdk text info file that lives at the root of the install image.
|
||||
|
||||
JDK_INFO_FILE = $(JDK_IMAGE_DIR)/release
|
||||
JRE_INFO_FILE = $(JRE_IMAGE_DIR)/release
|
||||
|
||||
# Common way to emit a line into the release or info file
|
||||
define info-file-item # name value
|
||||
$(PRINTF) "%s=\"%s\"\n" $1 $2 >> $@
|
||||
endef
|
||||
|
||||
# Values to emit
|
||||
MINIMUM_OS_NAME := $(REQUIRED_OS_NAME)
|
||||
MINIMUM_OS_VERSION := $(REQUIRED_OS_VERSION)
|
||||
MINIMUM_OS_ARCH := $(ARCH)
|
||||
|
||||
$(JDK_INFO_FILE): FRC
|
||||
$(prep-target)
|
||||
$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
|
||||
$(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)")
|
||||
$(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)")
|
||||
$(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)")
|
||||
|
||||
# Create release file to identify this image
|
||||
identify-image-jdk:: $(JDK_INFO_FILE)
|
||||
|
||||
$(JRE_INFO_FILE): FRC
|
||||
$(prep-target)
|
||||
$(call info-file-item, "JAVA_VERSION", "$(THIS_JDK_VERSION)")
|
||||
$(call info-file-item, "OS_NAME", "$(MINIMUM_OS_NAME)")
|
||||
$(call info-file-item, "OS_VERSION", "$(MINIMUM_OS_VERSION)")
|
||||
$(call info-file-item, "OS_ARCH", "$(MINIMUM_OS_ARCH)")
|
||||
|
||||
# Create release file to identify this image
|
||||
identify-image-jre:: $(JRE_INFO_FILE)
|
||||
|
||||
###################################################################
|
||||
# What do we compare against
|
||||
@ -1276,6 +1279,7 @@ images images-clobber::
|
||||
initial-image-jre-setup \
|
||||
trim-image-jre trim-image-jdk \
|
||||
process-image-jre process-image-jdk \
|
||||
identify-image-jre identify-image-jdk \
|
||||
install-previous-jre install-previous-jdk \
|
||||
compare-image-jre compare-image-jdk \
|
||||
compare-image compare-image-clobber \
|
||||
|
||||
@ -35,6 +35,7 @@ ifeq ($(PLATFORM), windows)
|
||||
LIBEXE = $(COMPILER_PATH)lib
|
||||
LINK = $(COMPILER_PATH)link
|
||||
LINK32 = $(LINK)
|
||||
DUMPBIN = $(COMPILER_PATH)dumpbin.exe
|
||||
|
||||
# Fill in unknown values
|
||||
COMPILER_NAME=Unknown MSVC Compiler
|
||||
@ -139,8 +140,8 @@ ifeq ($(PLATFORM), windows)
|
||||
_OTHER_TOOLS_BIN = $(WINDOWSSDKDIR)/Bin/x64
|
||||
endif
|
||||
endif
|
||||
RC = $(_OTHER_TOOLS_BIN)/rc.exe
|
||||
REBASE = $(_OTHER_TOOLS_BIN)/rebase.exe
|
||||
RC = $(_OTHER_TOOLS_BIN)/RC.Exe
|
||||
REBASE = $(_OTHER_TOOLS_BIN)/ReBase.Exe
|
||||
MT = $(_OTHER_TOOLS_BIN)/mt.exe
|
||||
MTL = $(_OTHER_TOOLS_BIN)/midl.exe
|
||||
endif
|
||||
|
||||
@ -76,12 +76,9 @@ SRC_BUNDLEDIR = $(OUTPUTDIR)/source-bundles
|
||||
ABS_SRC_BUNDLEDIR = $(ABS_OUTPUTDIR)/source-bundles
|
||||
BIN_BUNDLEDIR = $(OUTPUTDIR)/bundles
|
||||
ABS_BIN_BUNDLEDIR = $(ABS_OUTPUTDIR)/bundles
|
||||
JRL_BUNDLEDIR = $(OUTPUTDIR)/java.net
|
||||
ABS_JRL_BUNDLEDIR = $(ABS_OUTPUTDIR)/java.net
|
||||
|
||||
dummy := $(shell $(MKDIR) -p $(BIN_BUNDLEDIR))
|
||||
dummy := $(shell $(MKDIR) -p $(SRC_BUNDLEDIR) )
|
||||
dummy := $(shell $(MKDIR) -p $(JRL_BUNDLEDIR) )
|
||||
|
||||
TEMP_DIR = $(OUTPUTDIR)/tmp
|
||||
ABS_TEMP_DIR = $(ABS_OUTPUTDIR)/tmp
|
||||
|
||||
@ -177,3 +177,20 @@ else
|
||||
endif
|
||||
HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
|
||||
|
||||
# Special define for checking the binaries
|
||||
|
||||
# Macro to check it's input file for banned dependencies and verify the
|
||||
# binary built properly. Relies on process exit code.
|
||||
define binary_file_verification # binary_file
|
||||
( \
|
||||
$(ECHO) "Checking for mapfile use in: $1" && \
|
||||
if [ "`$(NM) -D -g --defined-only $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
|
||||
$(ECHO) "WARNING: File was not built with a mapfile: $1"; \
|
||||
fi && \
|
||||
$(ECHO) "Library loads for: $1" && \
|
||||
$(LDD) $1 && \
|
||||
$(ECHO) "RUNPATH for: $1" && \
|
||||
( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
|
||||
)
|
||||
endef
|
||||
|
||||
|
||||
@ -186,3 +186,20 @@ else
|
||||
endif
|
||||
HOTSPOT_SERVER_PATH:=$(call AltCheckValue,HOTSPOT_SERVER_PATH)
|
||||
|
||||
# Special define for checking the binaries
|
||||
|
||||
# Macro to check it's input file for banned dependencies and verify the
|
||||
# binary built properly. Relies on process exit code.
|
||||
define binary_file_verification # binary_file
|
||||
( \
|
||||
$(ECHO) "Checking for mapfile use in: $1" && \
|
||||
if [ "`$(NM) -g -D $1 | $(EGREP) -v 'UNDEF' | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
|
||||
$(ECHO) "WARNING: File was not built with a mapfile: $1"; \
|
||||
fi && \
|
||||
$(ECHO) "Library loads for: $1" && \
|
||||
$(LDD) $1 && \
|
||||
$(ECHO) "RUNPATH for: $1" && \
|
||||
( $(DUMP) -L -v $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
|
||||
)
|
||||
endef
|
||||
|
||||
|
||||
@ -85,6 +85,7 @@ DATE = $(UTILS_COMMAND_PATH)date
|
||||
DF = $(UTILS_COMMAND_PATH)df
|
||||
DIFF = $(UTILS_USR_BIN_PATH)diff
|
||||
DIRNAME = $(UTILS_USR_BIN_PATH)dirname
|
||||
DUMP = $(UTILS_CCS_BIN_PATH)dump
|
||||
ECHO = $(UTILS_COMMAND_PATH)echo
|
||||
EGREP = $(UTILS_COMMAND_PATH)egrep
|
||||
EXPR = $(UTILS_USR_BIN_PATH)expr
|
||||
@ -99,6 +100,7 @@ ID = $(UTILS_COMMAND_PATH)id
|
||||
ISAINFO = $(UTILS_COMMAND_PATH)isainfo
|
||||
KSH = $(UTILS_COMMAND_PATH)ksh
|
||||
LD = $(UTILS_CCS_BIN_PATH)ld
|
||||
LDD = $(UTILS_USR_BIN_PATH)ldd
|
||||
LEX = $(UTILS_CCS_BIN_PATH)lex
|
||||
LN = $(UTILS_COMMAND_PATH)ln
|
||||
LS = $(UTILS_COMMAND_PATH)ls
|
||||
@ -114,6 +116,7 @@ PKGMK = $(UTILS_COMMAND_PATH)pkgmk
|
||||
PRINTF = $(UTILS_USR_BIN_PATH)printf
|
||||
PWD = $(UTILS_COMMAND_PATH)pwd
|
||||
RC = $(UTILS_COMMAND_PATH)rc
|
||||
READELF = $(UTILS_USR_BIN_PATH)readelf
|
||||
RMDIR = $(UTILS_COMMAND_PATH)rmdir
|
||||
RPM = $(UTILS_COMMAND_PATH)rpm
|
||||
RPMBUILD = $(UTILS_COMMAND_PATH)rpmbuild
|
||||
|
||||
@ -127,6 +127,7 @@ endif
|
||||
|
||||
# Solaris specific
|
||||
ifeq ($(PLATFORM), solaris)
|
||||
REQUIRED_OS_NAME = SunOS
|
||||
REQUIRED_OS_VERSION = 5.10
|
||||
REQUIRED_OS_VARIANT_NAME = Solaris
|
||||
REQUIRED_OS_VARIANT_VERSION = $(REQUIRED_OS_VERSION)
|
||||
@ -148,6 +149,7 @@ endif
|
||||
|
||||
# Linux specific
|
||||
ifeq ($(PLATFORM), linux)
|
||||
REQUIRED_OS_NAME = Linux
|
||||
REQUIRED_OS_VERSION = 2.6
|
||||
REQUIRED_OS_VARIANT_NAME = Fedora
|
||||
REQUIRED_OS_VARIANT_VERSION = 9
|
||||
@ -166,6 +168,7 @@ endif
|
||||
|
||||
# Windows specific
|
||||
ifeq ($(PLATFORM), windows)
|
||||
REQUIRED_OS_NAME = Windows
|
||||
ifeq ($(ARCH_DATA_MODEL),64)
|
||||
REQUIRED_OS_VERSION = 5.2
|
||||
REQUIRED_OS_VARIANT_NAME = Windows2003
|
||||
|
||||
@ -288,8 +288,8 @@ ifndef VS2010_EXISTS
|
||||
xVS100COMNTOOLS :="$(_program_files32)/Microsoft Visual Studio 10.0/Common7/Tools/"
|
||||
fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
|
||||
else
|
||||
xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
|
||||
ifneq ($(word 2,$(VS100COMNTOOLS)),)
|
||||
xVS100COMNTOOLS :="$(subst \,/,$(VS100COMNTOOLS))"
|
||||
fVS100COMNTOOLS :=$(call FullPath,$(xVS100COMNTOOLS))
|
||||
else
|
||||
fVS100COMNTOOLS :=$(xVS100COMNTOOLS)
|
||||
@ -551,18 +551,6 @@ ifndef ALT_BOOTDIR
|
||||
_BOOTDIR3 =$(SLASH_JAVA)/re/jdk/$(PREVIOUS_JDK_VERSION)/archive/fcs/binaries/$(PLATFORM)-$(ARCH)
|
||||
endif
|
||||
|
||||
# 32 bit always needs 2 runtimes, 64 bit usually does too
|
||||
|
||||
# MSVCRT_DLL_PATH: location of msvcrt.dll that will be re-distributed
|
||||
ifdef ALT_MSVCRT_DLL_PATH
|
||||
xALT_MSVCRT_DLL_PATH :="$(subst \,/,$(ALT_MSVCRT_DLL_PATH))"
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(xALT_MSVCRT_DLL_PATH))
|
||||
else
|
||||
MSVCRT_DLL_PATH :=$(call FullPath,$(_system_root)/system32/)
|
||||
endif
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckSpaces,MSVCRT_DLL_PATH)
|
||||
MSVCRT_DLL_PATH:=$(call AltCheckValue,MSVCRT_DLL_PATH)
|
||||
|
||||
# 32bit always needs the MSVCRNN runtime, 64bit does when using VS2008
|
||||
ifeq ($(ARCH_DATA_MODEL), 32)
|
||||
_NEEDS_MSVCRNN = true
|
||||
@ -641,15 +629,6 @@ else
|
||||
endif
|
||||
INSTALL_MSSDK:=$(call AltCheckSpaces,INSTALL_MSSDK)
|
||||
|
||||
# INSTALL_MSIVAL2: Installation of MsiVal2 for this platform (for install)
|
||||
ifdef ALT_INSTALL_MSIVAL2
|
||||
xALT_INSTALL_MSIVAL2 :="$(subst \,/,$(ALT_INSTALL_MSIVAL2))"
|
||||
INSTALL_MSIVAL2 :=$(call FullPath,$(xALT_INSTALL_MSIVAL2))
|
||||
else
|
||||
INSTALL_MSIVAL2 :=$(_program_files32)/MsiVal2
|
||||
endif
|
||||
INSTALL_MSIVAL2:=$(call AltCheckSpaces,INSTALL_MSIVAL2)
|
||||
|
||||
# WSCRIPT: path to wscript.exe (used in creating install bundles)
|
||||
ifdef ALT_WSCRIPT
|
||||
xALT_WSCRIPT :="$(subst \,/,$(ALT_WSCRIPT))"
|
||||
@ -685,43 +664,6 @@ else
|
||||
endif
|
||||
CABARC:=$(call AltCheckSpaces,CABARC)
|
||||
|
||||
# MSIVAL2: path to msival2.exe (used in validating install msi files)
|
||||
ifdef ALT_MSIVAL2
|
||||
xALT_MSIVAL2 :="$(subst \,/,$(ALT_MSIVAL2))"
|
||||
MSIVAL2 =$(xALT_MSIVAL2)
|
||||
else
|
||||
_MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe
|
||||
_MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe
|
||||
MSIVAL2 :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2))
|
||||
endif
|
||||
MSIVAL2:=$(call AltCheckSpaces,MSIVAL2)
|
||||
# suppress msival2 checks, as it hangs jprt builds
|
||||
ifdef SKIP_MSIVAL2
|
||||
MSIVAL2 := $(ECHO)
|
||||
endif
|
||||
|
||||
# LOGOCUB: path to cub file for (used in validating install msi files)
|
||||
ifdef ALT_LOGOCUB
|
||||
xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))"
|
||||
LOGOCUB =$(xALT_LOGOCUB)
|
||||
else
|
||||
_LOGOCUB1 :=$(INSTALL_MSIVAL2)/logo.cub
|
||||
_LOGOCUB2 :=$(DEVTOOLS_PATH)logo.cub
|
||||
LOGOCUB :=$(call FileExists,$(_LOGOCUB1),$(_LOGOCUB2))
|
||||
endif
|
||||
LOGOCUB:=$(call AltCheckSpaces,LOGOCUB)
|
||||
|
||||
# MSITRAN: path to msitran.exe (used in creating install bundles and sponsors)
|
||||
ifdef ALT_MSITRAN
|
||||
xALT_MSITRAN :="$(subst \,/,$(ALT_MSITRAN))"
|
||||
MSITRAN =$(xALT_MSITRAN)
|
||||
else
|
||||
_MSITRAN1 :=$(INSTALL_MSSDK)/Bin/msitran.exe
|
||||
_MSITRAN2 :=$(DEVTOOLS_PATH)msitran.exe
|
||||
MSITRAN :=$(call FileExists,$(_MSITRAN1),$(_MSITRAN2))
|
||||
endif
|
||||
MSITRAN:=$(call AltCheckSpaces,MSITRAN)
|
||||
|
||||
# MSICERT: path to msicert.exe (used in creating install bundles)
|
||||
ifdef ALT_MSICERT
|
||||
xALT_MSICERT :="$(subst \,/,$(ALT_MSICERT))"
|
||||
@ -798,3 +740,50 @@ else
|
||||
endif
|
||||
HOTSPOT_LIB_PATH:=$(call AltCheckSpaces,HOTSPOT_LIB_PATH)
|
||||
HOTSPOT_LIB_PATH:=$(call AltCheckValue,HOTSPOT_LIB_PATH)
|
||||
|
||||
# Special define for checking the binaries
|
||||
|
||||
ifeq ($(VS2010_EXISTS),true)
|
||||
|
||||
# All windows dll and exe files should have been built with /NXCOMPAT
|
||||
# and be setup for dynamic base addresses.
|
||||
# In addition, we should not be dependent on certain dll files that
|
||||
# we do not or cannot redistribute.
|
||||
|
||||
# List of filenames we should NOT be dependent on
|
||||
BANNED_DLLS=msvcp100[.]dll|msvcr100d[.]dll|msvcrtd[.]dll
|
||||
|
||||
# Macro to check it's input file for banned dependencies and verify the
|
||||
# binary was built properly. Relies on process exit code.
|
||||
define binary_file_verification # binary_file
|
||||
( \
|
||||
$(ECHO) "Checking for /NXCOMPAT usage in: $1" && \
|
||||
if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'NX compatible'`" = "" ] ; then \
|
||||
$(ECHO) "ERROR: Did not find 'NX compatible' in headers: $1" ; \
|
||||
$(DUMPBIN) /headers $1 ; \
|
||||
exit 7 ; \
|
||||
fi ; \
|
||||
$(ECHO) "Checking for /DYNAMICBASE usage in: $1" && \
|
||||
if [ "`$(DUMPBIN) /headers $1 | $(EGREP) -i 'Dynamic base'`" = "" ] ; then \
|
||||
$(ECHO) "ERROR: Did not find 'Dynamic base' in headers: $1" ; \
|
||||
$(DUMPBIN) /headers $1 ; \
|
||||
exit 8 ; \
|
||||
fi ; \
|
||||
$(ECHO) "Checking for banned dependencies in: $1" && \
|
||||
if [ "`$(DUMPBIN) /dependents $1 | $(EGREP) -i '$(BANNED_DLLS)'`" != "" ] ; then \
|
||||
$(ECHO) "ERROR: Found us of $(BANNED_DLLS)"; \
|
||||
$(DUMPBIN) /dependents $1 ; \
|
||||
exit 9 ; \
|
||||
fi ; \
|
||||
)
|
||||
endef
|
||||
|
||||
else
|
||||
|
||||
# Macro to check it's input file for banned dependencies and verify the
|
||||
# binary was built properly. Relies on process exit code.
|
||||
define binary_file_verification # binary_file
|
||||
endef
|
||||
|
||||
endif
|
||||
|
||||
|
||||
@ -96,7 +96,6 @@ ifeq ($(PLATFORM),solaris)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(PLATFORM),windows)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSVCRT_DLL_PATH)
|
||||
ifneq ($(MSVCRNN_DLL),)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSVCRNN_DLL_PATH)
|
||||
endif
|
||||
@ -117,6 +116,9 @@ ALL_SETTINGS+=$(call addRequiredVersionSetting,ZIP_VER)
|
||||
ALL_SETTINGS+=$(call addRequiredVersionSetting,UNZIP_VER)
|
||||
ifeq ($(PLATFORM),windows)
|
||||
ALL_SETTINGS+=$(call addRequiredVersionSetting,LINK_VER)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,CC)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,LINK)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,DUMPBIN)
|
||||
endif
|
||||
ALL_SETTINGS+=$(call addRequiredVersionSetting,ANT_VER)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,TEMPDIR)
|
||||
@ -226,13 +228,13 @@ ifeq ($(PLATFORM),windows)
|
||||
ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH)
|
||||
ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH)
|
||||
ALL_SETTINGS+=$(call addAltSetting,WINDOWSSDKDIR)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,RC)
|
||||
ALL_SETTINGS+=$(call addRequiredSetting,REBASE)
|
||||
ifndef OPENJDK
|
||||
ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK)
|
||||
ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK)
|
||||
ALL_SETTINGS+=$(call addAltSetting,WSCRIPT)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSICERT)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSITRAN)
|
||||
ALL_SETTINGS+=$(call addAltSetting,MSIVAL2)
|
||||
endif
|
||||
endif
|
||||
ALL_SETTINGS+=$(call addAltSetting,CACERTS_FILE)
|
||||
|
||||
@ -879,13 +879,6 @@ sane-devtools_path:
|
||||
######################################################
|
||||
sane-msvcrt_path:
|
||||
ifeq ($(PLATFORM), windows)
|
||||
@if [ ! -r "$(MSVCRT_DLL_PATH)/msvcrt.dll" ]; then \
|
||||
$(ECHO) "ERROR: You do not have access to msvcrt.dll. \n" \
|
||||
" Please check your access to \n" \
|
||||
" $(MSVCRT_DLL_PATH) \n" \
|
||||
" and/or check your value of ALT_MSVCRT_DLL_PATH. \n" \
|
||||
"" >> $(ERROR_FILE) ; \
|
||||
fi
|
||||
ifneq ($(MSVCRNN_DLL),)
|
||||
@if [ ! -r "$(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)" ]; then \
|
||||
$(ECHO) "ERROR: You do not have access to $(MSVCRNN_DLL). \n" \
|
||||
@ -1018,6 +1011,22 @@ ifeq ($(PLATFORM), windows)
|
||||
" and/or check your value of ALT_MSDEVTOOLS_PATH. \n" \
|
||||
"" >> $(ERROR_FILE) ; \
|
||||
fi
|
||||
else
|
||||
ifeq ($(wildcard $(REBASE)),)
|
||||
@$(ECHO) "ERROR: Cannot find the REBASE utility from path: $(REBASE)\n" \
|
||||
" This is normally obtained from the WINDOWSSDKDIR." \
|
||||
"" >> $(ERROR_FILE)
|
||||
endif
|
||||
ifeq ($(wildcard $(RC)),)
|
||||
@$(ECHO) "ERROR: Cannot find the RC utility from path: $(RC)\n" \
|
||||
" This is normally obtained from the WINDOWSSDKDIR." \
|
||||
"" >> $(ERROR_FILE)
|
||||
endif
|
||||
ifeq ($(wildcard $(DUMPBIN)),)
|
||||
@$(ECHO) "ERROR: Cannot find the DUMPBIN utility from path: $(DUMPBIN)\n" \
|
||||
" This is normally obtained from the WINDOWSSDKDIR." \
|
||||
"" >> $(ERROR_FILE)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -1459,25 +1468,6 @@ ifeq ($(PLATFORM), windows)
|
||||
fi
|
||||
endif
|
||||
|
||||
######################################################
|
||||
# Check for existence of INSTALL_MSIVAL2 on windows
|
||||
######################################################
|
||||
sane-install-msival2_path:
|
||||
ifeq ($(PLATFORM), windows)
|
||||
@if [ -z "$(INSTALL_MSIVAL2)" ]; then \
|
||||
$(ECHO) "WARNING: Your INSTALL_MSIVAL2 setting is empty.\n" \
|
||||
" It is recommended to set ALT_INSTALL_MSIVAL2.\n" \
|
||||
"" >> $(WARNING_FILE) ; \
|
||||
fi
|
||||
@if [ ! -r "$(INSTALL_MSIVAL2)" ]; then \
|
||||
$(ECHO) "ERROR: You do not have a valid INSTALL_MSIVAL2 setting. \n" \
|
||||
" Please check your access to \n" \
|
||||
" $(INSTALL_MSIVAL2) \n" \
|
||||
" and/or check your value of ALT_INSTALL_MSIVAL2. \n" \
|
||||
"" >> $(ERROR_FILE) ; \
|
||||
fi
|
||||
endif
|
||||
|
||||
######################################################
|
||||
# Check the GNU C++ compiler for OJI plugin
|
||||
######################################################
|
||||
|
||||
@ -93,10 +93,6 @@ ifeq ($(PLATFORM), windows)
|
||||
|
||||
IMPORT_LIST += $(MS_RUNTIME_LIBRARIES:%=$(BINDIR)/%)
|
||||
|
||||
# NOTE: These might actually come from BUILDDIR, depends on the settings.
|
||||
$(BINDIR)/msvcrt.dll: $(MSVCRT_DLL_PATH)/msvcrt.dll
|
||||
$(install-import-file)
|
||||
$(call chmod-file, a+x)
|
||||
$(BINDIR)/$(MSVCRNN_DLL): $(MSVCRNN_DLL_PATH)/$(MSVCRNN_DLL)
|
||||
$(install-import-file)
|
||||
$(call chmod-file, a+x)
|
||||
@ -223,12 +219,15 @@ endif # PLATFORM
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVM_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVM_NAME): $(HOTSPOT_KERNEL_PATH)/$(JVM_NAME)
|
||||
$(install-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(LIBJSIG_NAME): $(HOTSPOT_IMPORT_PATH)/$(ARCH_VM_SUBDIR)/$(LIBJSIG_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(LIBJSIG_NAME) \
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
|
||||
@ -237,30 +236,39 @@ $(LIB_LOCATION)/$(SERVER_LOCATION)/$(LIBJSIG_NAME):
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDB_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDB_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME)
|
||||
$(install-import-file)
|
||||
@$(call binary_file_verification,$@)
|
||||
|
||||
$(LIB_LOCATION)/$(SERVER_LOCATION)/Xusage.txt : $(HOTSPOT_SERVER_PATH)/Xusage.txt
|
||||
$(install-import-file)
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
#
|
||||
# Assumes basic unix utilities are in the PATH already (uname, hostname, etc.).
|
||||
#
|
||||
# On Windows, assumes PROCESSOR_IDENTIFIER, VS71COMNTOOLS,
|
||||
# On Windows, assumes PROCESSOR_IDENTIFIER, VS100COMNTOOLS,
|
||||
# SYSTEMROOT (or SystemRoot), COMPUTERNAME (or hostname works), and
|
||||
# USERNAME is defined in the environment.
|
||||
# This profile does not rely on using vcvars32.bat and 64bit Setup.bat.
|
||||
@ -81,8 +81,7 @@
|
||||
# Windows Only:
|
||||
# ALT_UNIXCOMMAND_PATH
|
||||
# ALT_DXSDK_PATH
|
||||
# ALT_MSVCRT_DLL_PATH
|
||||
# ALT_MSVCR71_DLL_PATH
|
||||
# ALT_MSVCRNN_DLL_PATH
|
||||
#
|
||||
#############################################################################
|
||||
#
|
||||
@ -213,78 +212,17 @@ else
|
||||
# Compiler setup (nasty part)
|
||||
# NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE.
|
||||
# NOTE: CYGWIN has a link.exe too, make sure the compilers are first
|
||||
if [ "${windows_arch}" = i586 ] ; then
|
||||
# 32bit Windows compiler settings
|
||||
# VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined)
|
||||
vs_root=$(${cygpath} "${VS71COMNTOOLS}/../..")
|
||||
# Fill in PATH, LIB, and INCLUDE (unset all others to make sure)
|
||||
vc7_root="${vs_root}/Vc7"
|
||||
compiler_path="${vc7_root}/bin"
|
||||
platform_sdk="${vc7_root}/PlatformSDK"
|
||||
|
||||
# LIB and INCLUDE must use ; as a separator
|
||||
include4sdk="${vc7_root}/atlmfc/include"
|
||||
include4sdk="${include4sdk};${vc7_root}/include"
|
||||
include4sdk="${include4sdk};${platform_sdk}/include/prerelease"
|
||||
include4sdk="${include4sdk};${platform_sdk}/include"
|
||||
include4sdk="${include4sdk};${vs_root}/SDK/v1.1/include"
|
||||
lib4sdk="${lib4sdk};${vc7_root}/lib"
|
||||
lib4sdk="${lib4sdk};${platform_sdk}/lib/prerelease"
|
||||
lib4sdk="${lib4sdk};${platform_sdk}/lib"
|
||||
lib4sdk="${lib4sdk};${vs_root}/SDK/v1.1/lib"
|
||||
# Search path and DLL locating path
|
||||
# WARNING: CYGWIN has a link.exe too, make sure compilers are first
|
||||
path4sdk="${vs_root}/Common7/Tools/bin;${path4sdk}"
|
||||
path4sdk="${vs_root}/SDK/v1.1/bin;${path4sdk}"
|
||||
path4sdk="${vs_root}/Common7/Tools;${path4sdk}"
|
||||
path4sdk="${vs_root}/Common7/Tools/bin/prerelease;${path4sdk}"
|
||||
path4sdk="${vs_root}/Common7/IDE;${path4sdk}"
|
||||
path4sdk="${compiler_path};${path4sdk}"
|
||||
elif [ "${windows_arch}" = amd64 ] ; then
|
||||
# AMD64 64bit Windows compiler settings
|
||||
if [ "${ALT_DEPLOY_MSSDK}" != "" ] ; then
|
||||
platform_sdk=${ALT_DEPLOY_MSSDK}
|
||||
else
|
||||
platform_sdk=$(${cygpath} "C:/Program Files/Microsoft Platform SDK/")
|
||||
fi
|
||||
if [ "${ALT_COMPILER_PATH}" != "" ] ; then
|
||||
compiler_path=${ALT_COMPILER_PATH}
|
||||
if [ "${ALT_DEPLOY_MSSDK}" = "" ] ; then
|
||||
platform_sdk=${ALT_COMPILER_PATH}/../../../..
|
||||
fi
|
||||
else
|
||||
compiler_path="${platform_sdk}/Bin/win64/x86/AMD64"
|
||||
fi
|
||||
# LIB and INCLUDE must use ; as a separator
|
||||
include4sdk="${platform_sdk}/Include"
|
||||
include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys"
|
||||
include4sdk="${include4sdk};${platform_sdk}/Include/mfc"
|
||||
include4sdk="${include4sdk};${platform_sdk}/Include/atl"
|
||||
include4sdk="${include4sdk};${platform_sdk}/Include/crt"
|
||||
lib4sdk="${platform_sdk}/Lib/AMD64"
|
||||
lib4sdk="${lib4sdk};${platform_sdk}/Lib/AMD64/atlmfc"
|
||||
# Search path and DLL locating path
|
||||
# WARNING: CYGWIN has a link.exe too, make sure compilers are first
|
||||
path4sdk="${platform_sdk}/bin;${path4sdk}"
|
||||
path4sdk="${compiler_path};${path4sdk}"
|
||||
fi
|
||||
# Export LIB and INCLUDE
|
||||
unset lib
|
||||
unset Lib
|
||||
LIB="${lib4sdk}"
|
||||
export LIB
|
||||
unset include
|
||||
unset Include
|
||||
INCLUDE="${include4sdk}"
|
||||
export INCLUDE
|
||||
|
||||
# Turn all \\ into /, remove duplicates and trailing /
|
||||
slash_path="$(echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g')"
|
||||
path4sdk="${slash_path}"
|
||||
|
||||
# Convert path4sdk to cygwin style
|
||||
path4sdk="$(/usr/bin/cygpath -p ${path4sdk})"
|
||||
|
||||
# Use supplied vsvars.sh
|
||||
repo=`hg root`
|
||||
if [ -f "${repo}/make/scripts/vsvars.sh" ] ; then
|
||||
eval `sh ${repo}/make/scripts/vsvars.sh -v10`
|
||||
elif [ -f "${repo}/../make/scripts/vsvars.sh" ] ; then
|
||||
eval `sh ${repo}/../make/scripts/vsvars.sh -v10`
|
||||
else
|
||||
echo "WARNING: No make/scripts/vsvars.sh file found"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
# Get the previous JDK to be used to bootstrap the build
|
||||
|
||||
@ -389,10 +389,9 @@ Library: Use <code>/opt:REF </code> when building the dll.
|
||||
<li>
|
||||
MS DLL Runtime: Use the <code>/MD /D _STATIC_CPPLIB</code> option.
|
||||
<br>
|
||||
This causes your dll to become dependent on MSVCRT.DLL and/or
|
||||
the newer C++ runtime MSVCR71.DLL.
|
||||
This causes your dll to become dependent on just MSVCR*.DLL.
|
||||
The option /D _STATIC_CPPLIB prevents you from becoming dependent on the
|
||||
C++ library MSVCP71.DLL.
|
||||
C++ library MSVCP*.DLL.
|
||||
This is what we use in the JDK, but there are probably many combinations
|
||||
that you could safely use, unfortunately there are many combinations
|
||||
of runtimes that will not work.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user