JDK-7131186 : [macosx] Need mac bundles for visualvm
  • Type: Bug
  • Component: tools
  • Sub-Component: visualvm
  • Affected Version: 7,7u4
  • Priority: P3
  • Status: Closed
  • Resolution: Fixed
  • OS: generic,os_x
  • CPU: generic,x86
  • Submitted: 2012-01-18
  • Updated: 2012-05-23
  • Resolved: 2012-04-04
The Version table provides details related to the release that this issue/RFE will be addressed.

Unresolved : Release in which this issue/RFE will be addressed.
Resolved: Release in which this issue/RFE has been resolved.
Fixed : Release in which this issue/RFE has been fixed. The release containing this fix may be available for download as an Early Access Release or a General Availability Release.

To download the current JDK release, click here.
JDK 7 JDK 8
7u4 b18Fixed 8Fixed
Related Reports
Duplicate :  
Relates :  
Description
visualvm is provided for platforms other than mac. A visualvm bundle for the mac platform is needed.

Comments
SUGGESTED FIX # HG changeset patch # User jmelvin # Date 1332470567 14400 # Node ID 0f9e8631e4e6f01d9afcf99791504d6b41f91317 # Parent 6d3daae3bf1fe25284c9363da07cb44be080cd2d 7131186: [macosx] Need mac bundles for visualvm Summary: Add VisualVM bundles for Mac OS X. Reviewed-by: dcubed, thurka, cgruszka diff --git a/make/common/Binaries.gmk b/make/common/Binaries.gmk --- a/make/common/Binaries.gmk +++ b/make/common/Binaries.gmk @@ -40,13 +40,20 @@ # Visual vm is provided as a set of zip files, these zip files # are extracted into the "jdk image" directory with the common # java zip files and the platform specific ones, but for Solaris -# 64 only extract the platform specific bundle. +# 64 only extract the platform specific bundle. On Mac OS X, also +# copy to the j2sdk-bundle directory for packaging. extract-visualvm:: -ifneq ($(PLATFORM), macosx) ifndef SOLARIS64 oxe 584 => cat closed.export # HG changeset patch # User jmelvin # Date 1332470567 14400 # Node ID 0f9e8631e4e6f01d9afcf99791504d6b41f91317 # Parent 6d3daae3bf1fe25284c9363da07cb44be080cd2d 7131186: [macosx] Need mac bundles for visualvm Summary: Add VisualVM bundles for Mac OS X. Reviewed-by: dcubed, thurka, cgruszka diff --git a/make/common/Binaries.gmk b/make/common/Binaries.gmk --- a/make/common/Binaries.gmk +++ b/make/common/Binaries.gmk @@ -40,13 +40,20 @@ # Visual vm is provided as a set of zip files, these zip files # are extracted into the "jdk image" directory with the common # java zip files and the platform specific ones, but for Solaris -# 64 only extract the platform specific bundle. +# 64 only extract the platform specific bundle. On Mac OS X, also +# copy to the j2sdk-bundle directory for packaging. extract-visualvm:: -ifneq ($(PLATFORM), macosx) ifndef SOLARIS64 $(UNZIP) -o $(COPKG_VISUALVM_CMN_ZIP) -d $(JDK_IMAGE_DIR) endif +ifneq ($(PLATFORM), macosx) $(UNZIP) -o $(COPKG_VISUALVM_PLATFORM_ZIP) -d $(JDK_IMAGE_DIR) +else + # Additionally extract common and Mac platform support in bundle dir + # Fold amd64 to x86_64 to manage arch transition for Mac bundle + $(UNZIP) -o $(COPKG_VISUALVM_CMN_ZIP) -d $(JDK_BUNDLE_DIR)/Home + MAC_VISUALVM_ZIP=`echo $(COPKG_VISUALVM_PLATFORM_ZIP) | sed "s/amd64/x86_64/"`; \ + $(UNZIP) -o $${MAC_VISUALVM_ZIP} -d $(JDK_BUNDLE_DIR)/Home endif ###################################################### diff --git a/make/common/Sanity.gmk b/make/common/Sanity.gmk --- a/make/common/Sanity.gmk +++ b/make/common/Sanity.gmk @@ -309,18 +309,21 @@ # Check for existence of VisualVM zip files ###################################################### sane-install-visualvm: -ifneq ($(PLATFORM),macosx) @if [ ! -f "$(COPKG_VISUALVM_CMN_ZIP)" ]; then \ $(ECHO) "ERROR: $(COPKG_VISUALVM_CMN_ZIP) does not exist.\n" \ - " Make sure you've brought over the contents of $(COPKG_VISUALVM_DIR) directory.\n" \ - " COPKG_VISUALVM_DIR=$(COPKG_VISUALVM_DIR)\n" \ + " Make sure you've brought over the contents of $(COPKG_VISUALVM_DIR) directory.\n" \ + " COPKG_VISUALVM_DIR=$(COPKG_VISUALVM_DIR)\n" \ "" >> $(ERROR_FILE) ; \ fi - @if [ ! -f "$(COPKG_VISUALVM_PLATFORM_ZIP)" ]; then \ - $(ECHO) "ERROR: $(COPKG_VISUALVM_PLATFORM_ZIP) does not exist.\n" \ - " Make sure you've brought over the $(COPKG_VISUALVM_DIR) directory.\n" \ - " COPKG_VISUALVM_DIR=$(COPKG_VISUALVM_DIR)\n" \ + @VISUALVM_PLATFORM_ZIP=$(COPKG_VISUALVM_PLATFORM_ZIP) ; \ + if [ "$(PLATFORM)" = "macosx" ]; then \ + if [ ! -f "$${VISUALVM_PLATFORM_ZIP}" ]; then \ + VISUALVM_PLATFORM_ZIP=`echo $${VISUALVM_PLATFORM_ZIP} | sed "s/amd64/x86_64/"`; \ + fi; \ + fi; \ + if [ ! -f "$${VISUALVM_PLATFORM_ZIP}" ]; then \ + $(ECHO) "ERROR: $${VISUALVM_PLATFORM_ZIP} does not exist.\n" \ + " Make sure you've brought over the $(COPKG_VISUALVM_DIR) directory.\n" \ + " COPKG_VISUALVM_DIR=$(COPKG_VISUALVM_DIR)\n" \ "" >> $(ERROR_FILE) ; \ fi -endif - diff --git a/src/copkg/visualvm/macosx/macosx-x86_64.zip b/src/copkg/visualvm/macosx/macosx-x86_64.zip new file mode 100644 index 0000000000000000000000000000000000000000..6075cf03dcb956cbc5d12c1b12c05edd33dccdf5 GIT binary patch
21-03-2012

EVALUATION The current solution handles both os.arch values and is now independent of 7130404.
21-03-2012

EVALUATION This fix depends on 7130404 which should be resolved or rejected soon. We can add Visual VM right afterwards. The VisualVM bundles have been ready for quite some time.
23-02-2012