equal
deleted
inserted
replaced
36 ################################################################################ |
36 ################################################################################ |
37 |
37 |
38 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods |
38 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods |
39 |
39 |
40 LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
40 LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
41 $(SUPPORT_OUTPUTDIR)/modules_libs-stripped $(IMPORT_MODULES_LIBS)))) |
41 $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS)))) |
42 CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
42 CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
43 $(SUPPORT_OUTPUTDIR)/modules_cmds-stripped $(IMPORT_MODULES_CMDS)))) |
43 $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS)))) |
44 CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
44 CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
45 $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF)))) |
45 $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF)))) |
46 CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE)) |
46 CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE)) |
47 |
47 |
48 $(eval $(call FillCacheFind, \ |
48 $(eval $(call FillCacheFind, \ |
101 --module-version $(VERSION_SHORT) \ |
101 --module-version $(VERSION_SHORT) \ |
102 --os-name $(REQUIRED_OS_NAME) \ |
102 --os-name $(REQUIRED_OS_NAME) \ |
103 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
103 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
104 --os-version $(REQUIRED_OS_VERSION) \ |
104 --os-version $(REQUIRED_OS_VERSION) \ |
105 --module-path $(JMODS_DIR) \ |
105 --module-path $(JMODS_DIR) \ |
106 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \ |
106 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ |
107 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
107 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
108 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
108 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
109 |
109 |
110 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |
110 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |
111 |
111 |