105 else
106 ifeq ($$($1_TYPE), tar.gz)
107 $(CD) $$($1_BASE_DIR) \
108 && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
109 $(TAR_IGNORE_EXIT_VALUE) ) \
110 | $(GZIP) > $$@
111 else ifeq ($$($1_TYPE), zip)
112 $(CD) $$($1_BASE_DIR) \
113 && $(ZIP) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files
114 endif
115 endif
116
117 $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME)
118
119 endef
120
121 ################################################################################
122
123 # On Macosx, we bundle up the macosx specific images which already have the
124 # correct base directories.
125 ifeq ($(OPENJDK_TARGET_OS), macosx)
126 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
127 JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
128 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
129 JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
130 JDK_BUNDLE_SUBDIR :=
131 JRE_BUNDLE_SUBDIR :=
132 else
133 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
134 JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
135 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
136 JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
137 ifneq ($(DEBUG_LEVEL), release)
138 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
139 JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
140 endif
141 endif
142
143 ################################################################################
144
145 ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
|
105 else
106 ifeq ($$($1_TYPE), tar.gz)
107 $(CD) $$($1_BASE_DIR) \
108 && ( $(TAR) cf - -$(TAR_INCLUDE_PARAM) $(SUPPORT_OUTPUTDIR)/bundles/_$1_files \
109 $(TAR_IGNORE_EXIT_VALUE) ) \
110 | $(GZIP) > $$@
111 else ifeq ($$($1_TYPE), zip)
112 $(CD) $$($1_BASE_DIR) \
113 && $(ZIP) -qr $$@ . -i@$(SUPPORT_OUTPUTDIR)/bundles/_$1_files
114 endif
115 endif
116
117 $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME)
118
119 endef
120
121 ################################################################################
122
123 # On Macosx, we bundle up the macosx specific images which already have the
124 # correct base directories.
125 ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
126 JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
127 JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
128 JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
129 JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
130 JDK_BUNDLE_SUBDIR :=
131 JRE_BUNDLE_SUBDIR :=
132 else
133 JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
134 JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
135 JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
136 JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
137 ifneq ($(DEBUG_LEVEL), release)
138 JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
139 JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
140 endif
141 endif
142
143 ################################################################################
144
145 ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
|