Wed, 14 Oct 2009 11:42:59 -0700
6722084: JPRT make file doesn't create required symbolic link to libjvm.so
Summary: Use -y zip option to preserve symbolic links.
Reviewed-by: never, jcoomes, kamg
1.1 --- a/make/jprt.gmk Wed Oct 14 10:36:57 2009 -0700 1.2 +++ b/make/jprt.gmk Wed Oct 14 11:42:59 2009 -0700 1.3 @@ -29,17 +29,24 @@ 1.4 MILESTONE=$(JPRT_BUILD_VERSION) 1.5 endif 1.6 1.7 +ifeq ($(OSNAME),windows) 1.8 + ZIPFLAGS=-q 1.9 +else 1.10 + # store symbolic links as the link 1.11 + ZIPFLAGS=-q -y 1.12 +endif 1.13 + 1.14 jprt_build_product: all_product copy_product_jdk export_product_jdk 1.15 ( $(CD) $(JDK_IMAGE_DIR) && \ 1.16 - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.17 + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.18 1.19 jprt_build_fastdebug: all_fastdebug copy_fastdebug_jdk export_fastdebug_jdk 1.20 ( $(CD) $(JDK_IMAGE_DIR)/fastdebug && \ 1.21 - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.22 + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.23 1.24 jprt_build_debug: all_debug copy_debug_jdk export_debug_jdk 1.25 ( $(CD) $(JDK_IMAGE_DIR)/debug && \ 1.26 - $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.27 + $(ZIPEXE) $(ZIPFLAGS) -r $(JPRT_ARCHIVE_BUNDLE) . ) 1.28 1.29 .PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug 1.30
2.1 --- a/make/linux/makefiles/defs.make Wed Oct 14 10:36:57 2009 -0700 2.2 +++ b/make/linux/makefiles/defs.make Wed Oct 14 11:42:59 2009 -0700 2.3 @@ -104,15 +104,17 @@ 2.4 VM_DEBUG=jvmg 2.5 2.6 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 2.7 + 2.8 +# client and server subdirectories have symbolic links to ../libjsig.so 2.9 +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so 2.10 + 2.11 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 2.12 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 2.13 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so 2.14 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so 2.15 ifneq ($(ZERO_BUILD), true) 2.16 ifeq ($(ARCH_DATA_MODEL), 32) 2.17 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 2.18 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 2.19 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so 2.20 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 2.21 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so 2.22 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
3.1 --- a/make/solaris/makefiles/defs.make Wed Oct 14 10:36:57 2009 -0700 3.2 +++ b/make/solaris/makefiles/defs.make Wed Oct 14 11:42:59 2009 -0700 3.3 @@ -65,16 +65,18 @@ 3.4 VM_DEBUG=jvmg 3.5 3.6 EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html 3.7 + 3.8 +# client and server subdirectories have symbolic links to ../libjsig.so 3.9 +EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so 3.10 + 3.11 EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server 3.12 EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt 3.13 -EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so 3.14 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so 3.15 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so 3.16 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so 3.17 ifeq ($(ARCH_DATA_MODEL), 32) 3.18 EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client 3.19 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt 3.20 - EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so 3.21 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 3.22 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so 3.23 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so