31 # style paths |
31 # style paths |
32 ifdef JPRT_ARCHIVE_BUNDLE |
32 ifdef JPRT_ARCHIVE_BUNDLE |
33 override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE)) |
33 override JPRT_ARCHIVE_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_BUNDLE)) |
34 endif |
34 endif |
35 ifdef JPRT_ARCHIVE_INSTALL_BUNDLE |
35 ifdef JPRT_ARCHIVE_INSTALL_BUNDLE |
36 override JPRT_ARCHIVE_INSTALL_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) |
36 override JPRT_ARCHIVE_INSTALL_BUNDLE := \ |
|
37 $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_INSTALL_BUNDLE)) |
37 endif |
38 endif |
38 ifdef JPRT_ARCHIVE_TEST_BUNDLE |
39 ifdef JPRT_ARCHIVE_TEST_BUNDLE |
39 override JPRT_ARCHIVE_TEST_BUNDLE := $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE)) |
40 override JPRT_ARCHIVE_TEST_BUNDLE := \ |
|
41 $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_TEST_BUNDLE)) |
|
42 endif |
|
43 ifdef JPRT_ARCHIVE_SYMBOLS_BUNDLE |
|
44 override JPRT_ARCHIVE_SYMBOLS_BUNDLE := \ |
|
45 $(shell $(CYGPATH) -u $(JPRT_ARCHIVE_SYMBOLS_BUNDLE)) |
40 endif |
46 endif |
41 endif |
47 endif |
42 |
48 |
43 # When running in JPRT these will be provided. Need defaults so that this makefile |
49 # When running in JPRT these will be provided. Need defaults so that this makefile |
44 # is valid anyway. |
50 # is valid anyway. |
49 JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip |
55 JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip |
50 endif |
56 endif |
51 ifndef JPRT_ARCHIVE_TEST_BUNDLE |
57 ifndef JPRT_ARCHIVE_TEST_BUNDLE |
52 JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip |
58 JPRT_ARCHIVE_TEST_BUNDLE=/tmp/jprt_bundles/test-image.zip |
53 endif |
59 endif |
|
60 ifndef JPRT_ARCHIVE_SYMBOLS_BUNDLE |
|
61 JPRT_ARCHIVE_SYMBOLS_BUNDLE=/tmp/jprt_bundles/symbols-image.zip |
|
62 endif |
54 |
63 |
55 ifeq ($(SKIP_BOOT_CYCLE), false) |
64 ifeq ($(SKIP_BOOT_CYCLE), false) |
56 jprt_bundle: bootcycle-images |
65 jprt_bundle: bootcycle-images |
57 endif |
66 endif |
58 |
67 |
59 # This target must be called in the context of a SPEC file |
68 # This target must be called in the context of a SPEC file |
60 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE) |
69 jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) $(JPRT_ARCHIVE_TEST_BUNDLE) |
|
70 |
|
71 ifeq ($(GCOV_ENABLED), true) |
|
72 jprt_bundle: $(JPRT_ARCHIVE_SYMBOLS_BUNDLE) |
|
73 endif |
61 |
74 |
62 # This target must be called in the context of a SPEC file |
75 # This target must be called in the context of a SPEC file |
63 $(JPRT_ARCHIVE_BUNDLE): bundles |
76 $(JPRT_ARCHIVE_BUNDLE): bundles |
64 $(MKDIR) -p $(@D) |
77 $(MKDIR) -p $(@D) |
65 $(RM) $@ |
78 $(RM) $@ |
68 $(JPRT_ARCHIVE_TEST_BUNDLE): bundles |
81 $(JPRT_ARCHIVE_TEST_BUNDLE): bundles |
69 $(MKDIR) -p $(@D) |
82 $(MKDIR) -p $(@D) |
70 $(RM) $@ |
83 $(RM) $@ |
71 $(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@ |
84 $(CP) $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip $@ |
72 |
85 |
|
86 $(JPRT_ARCHIVE_SYMBOLS_BUNDLE): bundles |
|
87 $(MKDIR) -p $(@D) |
|
88 $(RM) $@ |
|
89 $(CP) $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip $@ |
|
90 |
73 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) |
91 SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR) |
74 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) |
92 SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR) |
75 SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR) |
93 SRC_TEST_IMAGE_DIR := $(TEST_IMAGE_DIR) |
76 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) |
94 SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR) |
77 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) |
95 SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR) |
78 |
96 |
79 # Bundle up the images |
97 # Bundle up the images |
80 bundles: all |
98 bundles: all |
81 @$(call TargetEnter) |
99 @$(call TargetEnter) |
82 $(MKDIR) -p $(BUILD_OUTPUT)/bundles |
100 $(MKDIR) -p $(BUILD_OUTPUT)/bundles |
83 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . |
101 $(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r \ |
84 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . |
102 $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip . |
85 $(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip . |
103 $(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r \ |
|
104 $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip . |
|
105 $(CD) $(SRC_TEST_IMAGE_DIR) && $(ZIP) -y -q -r \ |
|
106 $(BUILD_OUTPUT)/bundles/$(TEST_IMAGE_SUBDIR).zip . |
86 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ |
107 if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \ |
87 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ |
108 $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r \ |
|
109 $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \ |
|
110 fi |
|
111 if [ -d $(SYMBOLS_IMAGE_DIR) ] ; then \ |
|
112 $(CD) $(SYMBOLS_IMAGE_DIR) && $(ZIP) -y -q -r \ |
|
113 $(BUILD_OUTPUT)/bundles/$(SYMBOLS_IMAGE_SUBDIR).zip . ; \ |
88 fi |
114 fi |
89 @$(call TargetExit) |
115 @$(call TargetExit) |
90 |
116 |
91 # Copy images to one unified location regardless of platform etc. |
117 # Copy images to one unified location regardless of platform etc. |
92 final-images: all |
118 final-images: all |