36 $(eval $(call IncludeCustomExtension, CreateJmods.gmk)) |
36 $(eval $(call IncludeCustomExtension, CreateJmods.gmk)) |
37 |
37 |
38 ################################################################################ |
38 ################################################################################ |
39 |
39 |
40 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods |
40 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods |
41 JMODS_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/jmods |
41 JMODS_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/images/jmods |
42 JMOD_FILE := $(MODULE).jmod |
42 JMOD_FILE := $(MODULE).jmod |
43 |
43 |
44 LIBS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
44 LIBS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
45 $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS)))) |
45 $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS)))) |
46 CMDS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
46 CMDS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
152 |
152 |
153 # If creating interim versions of jmods, certain files need to be filtered out |
153 # If creating interim versions of jmods, certain files need to be filtered out |
154 # to avoid false incremental rebuilds. |
154 # to avoid false incremental rebuilds. |
155 ifeq ($(INTERIM_JMOD), true) |
155 ifeq ($(INTERIM_JMOD), true) |
156 DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS)) |
156 DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS)) |
|
157 INTERIM_MSG := interim$(SPACE) |
157 endif |
158 endif |
158 |
159 |
159 JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' |
160 JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' |
160 |
161 |
161 # Create jmods in the support dir and then move them into place to keep the |
162 # Create jmods in the support dir and then move them into place to keep the |
162 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times. |
163 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times. |
163 $(eval $(call SetupExecute, create_$(JMOD_FILE), \ |
164 $(eval $(call SetupExecute, create_$(JMOD_FILE), \ |
164 WARN := Creating $(JMOD_FILE), \ |
165 WARN := Creating $(INTERIM_MSG)$(JMOD_FILE), \ |
165 DEPS := $(DEPS), \ |
166 DEPS := $(DEPS), \ |
166 OUTPUT_FILE := $(JMODS_DIR)/$(JMOD_FILE), \ |
167 OUTPUT_FILE := $(JMODS_DIR)/$(JMOD_FILE), \ |
167 SUPPORT_DIR := $(JMODS_SUPPORT_DIR), \ |
168 SUPPORT_DIR := $(JMODS_SUPPORT_DIR), \ |
168 PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \ |
169 PRE_COMMAND := $(RM) $(JMODS_DIR)/$(JMOD_FILE) $(JMODS_SUPPORT_DIR)/$(JMOD_FILE), \ |
169 COMMAND := $(JMOD) create --module-version $(VERSION_SHORT) \ |
170 COMMAND := $(JMOD) create --module-version $(VERSION_SHORT) \ |