1 # |
1 # |
2 # Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. |
2 # Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # |
4 # |
5 # This code is free software; you can redistribute it and/or modify it |
5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as |
6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. Oracle designates this |
7 # published by the Free Software Foundation. Oracle designates this |
198 $(JPRT_ARCHIVE_BUNDLE): bundles |
198 $(JPRT_ARCHIVE_BUNDLE): bundles |
199 $(MKDIR) -p $(@D) |
199 $(MKDIR) -p $(@D) |
200 $(RM) $@ |
200 $(RM) $@ |
201 $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ |
201 $(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@ |
202 |
202 |
203 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) |
203 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) |
204 SRC_JDK_IMAGE_DIR := $(JDK_OVERLAY_IMAGE_DIR) |
204 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) |
205 SRC_JRE_IMAGE_DIR := $(JRE_OVERLAY_IMAGE_DIR) |
|
206 else |
|
207 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) |
|
208 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) |
|
209 endif |
|
210 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) |
205 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) |
211 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) |
206 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) |
212 |
207 |
213 # Bundle up the images |
208 # Bundle up the images |
214 bundles: all bundles-only |
209 bundles: all bundles-only |
215 bundles-only: start-make |
210 bundles-only: start-make |
216 @$(call TargetEnter) |
211 @$(call TargetEnter) |
217 $(MKDIR) -p $(BUILD_OUTPUT)/bundles |
212 $(MKDIR) -p $(BUILD_OUTPUT)/bundles |
218 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . |
213 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . |
219 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . |
214 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . |
220 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ |
215 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ |
221 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ |
216 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ |
222 fi |
217 fi |
223 @$(call TargetExit) |
218 @$(call TargetExit) |
224 |
219 |
225 # Copy images to one unified location regardless of platform etc. |
220 # Copy images to one unified location regardless of platform etc. |
226 final-images: all final-images-only |
221 final-images: all final-images-only |