comparison make/Jprt.gmk @ 1232:eefa97d0d263

8065215: Print warning summary at end of configure Reviewed-by: erikj, tbell
author ihse
date Fri, 21 Nov 2014 16:11:28 +0100
parents 9f7e3458a6b6
children 394de05938d7
comparison
equal deleted inserted replaced
3:7c24d2a50c3e 4:1011a88fe05a
50 jprt_bundle: bootcycle-images 50 jprt_bundle: bootcycle-images
51 endif 51 endif
52 52
53 # This target must be called in the context of a SPEC file 53 # This target must be called in the context of a SPEC file
54 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) 54 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
55 @$(call CheckIfMakeAtEnd)
56 55
57 # This target must be called in the context of a SPEC file 56 # This target must be called in the context of a SPEC file
58 $(JPRT_ARCHIVE_BUNDLE): bundles 57 $(JPRT_ARCHIVE_BUNDLE): bundles
59 $(MKDIR) -p $(@D) 58 $(MKDIR) -p $(@D)
60 $(RM) $@ 59 $(RM) $@
64 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) 63 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
65 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) 64 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
66 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) 65 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
67 66
68 # Bundle up the images 67 # Bundle up the images
69 bundles: all bundles-only 68 bundles: all
70 bundles-only: start-make
71 @$(call TargetEnter) 69 @$(call TargetEnter)
72 $(MKDIR) -p $(BUILD_OUTPUT)/bundles 70 $(MKDIR) -p $(BUILD_OUTPUT)/bundles
73 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . 71 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
74 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . 72 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
75 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ 73 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
76 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ 74 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
77 fi 75 fi
78 @$(call TargetExit) 76 @$(call TargetExit)
79 77
80 # Copy images to one unified location regardless of platform etc. 78 # Copy images to one unified location regardless of platform etc.
81 final-images: all final-images-only 79 final-images: all
82 final-images-only: start-make
83 @$(call TargetEnter) 80 @$(call TargetEnter)
84 $(RM) -r $(BUILD_OUTPUT)/final-images 81 $(RM) -r $(BUILD_OUTPUT)/final-images
85 $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR) 82 $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
86 $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR) 83 $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
87 $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/ 84 $(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
95 @$(call TargetExit) 92 @$(call TargetExit)
96 93
97 94
98 ########################################################################### 95 ###########################################################################
99 # Phony targets 96 # Phony targets
100 .PHONY: jprt_bundle bundles bundles-only final-images final-images-only 97 .PHONY: jprt_bundle bundles final-images