equal
deleted
inserted
replaced
75 |
75 |
76 # Param 1 - The file containing the MODULES list |
76 # Param 1 - The file containing the MODULES list |
77 define create-info-file |
77 define create-info-file |
78 $(if $(JDK_ARCH_ABI_PROP_NAME), \ |
78 $(if $(JDK_ARCH_ABI_PROP_NAME), \ |
79 $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) |
79 $(call info-file-item, "SUN_ARCH_ABI", "$(JDK_ARCH_ABI_PROP_NAME)")) |
80 $(call info-file-item, "SOURCE", "$(strip $(ALL_SOURCE_TIPS))") |
80 $(call info-file-item, "SOURCE", "$(strip $(SOURCE_REVISION))") |
81 endef |
81 endef |
82 |
82 |
83 # Param 1 - The file containing the MODULES list |
83 # Param 1 - The file containing the MODULES list |
84 define prepare-info-file |
84 define prepare-info-file |
85 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
85 $(ECHO) $(LOG_INFO) Generating $(patsubst $(OUTPUT_ROOT)/%,%,$@) |
93 endef |
93 endef |
94 |
94 |
95 # Create a variable dependency file common for all release info files. |
95 # Create a variable dependency file common for all release info files. |
96 INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file) |
96 INFO_FILE_VARDEPS := $(call DependOnVariable, create-info-file) |
97 |
97 |
98 ALL_SOURCE_TIPS = $(shell \ |
98 SOURCE_REVISION = $(shell \ |
99 if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \ |
99 if [ -f $(SOURCE_REVISION_TRACKER) ] ; then \ |
100 $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \ |
100 $(CAT) $(SOURCE_REVISION_TRACKER) ; \ |
101 fi) |
101 fi) |
102 |
102 |
103 $(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SUPPORT_OUTPUTDIR)/source_tips |
103 $(BASE_RELEASE_FILE): $(INFO_FILE_VARDEPS) $(SOURCE_REVISION_TRACKER) |
104 $(info-file) |
104 $(info-file) |
105 |
105 |
106 ################################################################################ |
106 ################################################################################ |
107 |
107 |
108 JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod) |
108 JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod) |