make/MacBundles.gmk

*** 47,72 ****
      BUNDLE_VENDOR := UNDEFINED
    else
      BUNDLE_VENDOR := $(COMPANY_NAME)
    endif
  
!   JDK_FILE_LIST := $(shell $(FIND) $(JDK_IMAGE_DIR))
!   JRE_FILE_LIST := $(shell $(FIND) $(JRE_IMAGE_DIR))
! 
!   JDK_TARGET_LIST := $(subst $(JDK_IMAGE_DIR)/,$(JDK_MACOSX_CONTENTS_DIR)/Home/,$(JDK_FILE_LIST))
!   JRE_TARGET_LIST := $(subst $(JRE_IMAGE_DIR)/,$(JRE_MACOSX_CONTENTS_DIR)/Home/,$(JRE_FILE_LIST))
! 
!   # Copy empty directories (jre/lib/applet).
!   $(JDK_MACOSX_CONTENTS_DIR)/Home/%: $(JDK_IMAGE_DIR)/%
!         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
!         $(MKDIR) -p $(@D)
!         if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
! 
!   $(JRE_MACOSX_CONTENTS_DIR)/Home/%: $(JRE_IMAGE_DIR)/%
!         $(call LogInfo, Copying $(patsubst $(OUTPUTDIR)/%,%,$@))
!         $(MKDIR) -p $(@D)
!         if [ -d "$<" ]; then $(MKDIR) -p $@; else $(CP) -f -R -P '$<' '$@'; fi
  
    $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
          $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
          $(MKDIR) -p $(@D)
          $(RM) $@
--- 47,69 ----
      BUNDLE_VENDOR := UNDEFINED
    else
      BUNDLE_VENDOR := $(COMPANY_NAME)
    endif
  
!   # Ideally the prerequisites of these two rules should be all files in the src
!   # dir, but running find over all of them takes unnecessary time, and more
!   # importantly, there may be files with spaces in the names which are very
!   # tricky to handle in make.
!   $(JDK_MACOSX_CONTENTS_DIR)/Home/bin/java: $(JDK_IMAGE_DIR)/bin/java
!         $(call LogInfo, Copying $(JDK_MACOSX_CONTENTS_DIR)/Home)
!         $(call MakeDir, $(JDK_MACOSX_CONTENTS_DIR)/Home)
!         $(CP) -f -R -P $(JDK_IMAGE_DIR)/. $(JDK_MACOSX_CONTENTS_DIR)/Home/
! 
!   $(JRE_MACOSX_CONTENTS_DIR)/Home/bin/java: $(JRE_IMAGE_DIR)/bin/java
!         $(call LogInfo, Copying $(JRE_MACOSX_CONTENTS_DIR)/Home)
!         $(call MakeDir, $(JRE_MACOSX_CONTENTS_DIR)/Home)
!         $(CP) -f -R -P $(JRE_IMAGE_DIR)/. $(JRE_MACOSX_CONTENTS_DIR)/Home/
  
    $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib:
          $(call LogInfo, Creating link $(patsubst $(OUTPUTDIR)/%,%,$@))
          $(MKDIR) -p $(@D)
          $(RM) $@
*** 100,114 ****
            @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
            @@VERSION@@ => $(BUNDLE_VERSION) ; \
            @@VENDOR@@ => $(BUNDLE_VENDOR) , \
    ))
  
!   jdk-bundle: $(JDK_TARGET_LIST) $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
        $(BUILD_JDK_PLIST)
          $(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
  
!   jre-bundle: $(JRE_TARGET_LIST) $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
        $(BUILD_JRE_PLIST)
          $(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
  
  else # Not macosx
  
--- 97,113 ----
            @@PLATFORM_VERSION@@ => $(BUNDLE_PLATFORM_VERSION) ; \
            @@VERSION@@ => $(BUNDLE_VERSION) ; \
            @@VENDOR@@ => $(BUNDLE_VENDOR) , \
    ))
  
!   jdk-bundle: $(JDK_MACOSX_CONTENTS_DIR)/Home/bin/java \
!       $(JDK_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
        $(BUILD_JDK_PLIST)
          $(SETFILE) -a B $(dir $(JDK_MACOSX_CONTENTS_DIR))
  
!   jre-bundle: $(JRE_MACOSX_CONTENTS_DIR)/Home/bin/java \
!       $(JRE_MACOSX_CONTENTS_DIR)/MacOS/libjli.dylib \
        $(BUILD_JRE_PLIST)
          $(SETFILE) -a B $(dir $(JRE_MACOSX_CONTENTS_DIR))
  
  else # Not macosx