equal
deleted
inserted
replaced
42 CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
42 CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
43 $(SUPPORT_OUTPUTDIR)/modules_cmds $(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 INCLUDE_HEADERS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
|
48 $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS)))) |
|
49 MAN_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \ |
|
50 $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN)))) |
47 |
51 |
48 $(eval $(call FillCacheFind, \ |
52 $(eval $(call FillCacheFind, \ |
49 $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \ |
53 $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \ |
50 )) |
54 )) |
51 |
55 |
62 DEPS += $(call CacheFind, $(CONF_DIR)) |
66 DEPS += $(call CacheFind, $(CONF_DIR)) |
63 endif |
67 endif |
64 ifneq ($(CLASSES_DIR), ) |
68 ifneq ($(CLASSES_DIR), ) |
65 JMOD_FLAGS += --class-path $(CLASSES_DIR) |
69 JMOD_FLAGS += --class-path $(CLASSES_DIR) |
66 DEPS += $(call CacheFind, $(CLASSES_DIR)) |
70 DEPS += $(call CacheFind, $(CLASSES_DIR)) |
|
71 endif |
|
72 ifneq ($(INCLUDE_HEADERS_DIR), ) |
|
73 JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR) |
|
74 DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR)) |
|
75 endif |
|
76 ifneq ($(MAN_DIR), ) |
|
77 JMOD_FLAGS += --man-pages $(MAN_DIR) |
|
78 DEPS += $(call CacheFind, $(MAN_DIR)) |
67 endif |
79 endif |
68 |
80 |
69 # Add dependencies on other jmod files. Only java.base needs access to other |
81 # Add dependencies on other jmod files. Only java.base needs access to other |
70 # jmods. |
82 # jmods. |
71 ifeq ($(MODULE), java.base) |
83 ifeq ($(MODULE), java.base) |
101 --module-version $(VERSION_SHORT) \ |
113 --module-version $(VERSION_SHORT) \ |
102 --os-name $(REQUIRED_OS_NAME) \ |
114 --os-name $(REQUIRED_OS_NAME) \ |
103 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
115 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
104 --os-version $(REQUIRED_OS_VERSION) \ |
116 --os-version $(REQUIRED_OS_VERSION) \ |
105 --module-path $(JMODS_DIR) \ |
117 --module-path $(JMODS_DIR) \ |
106 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ |
118 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ |
107 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
119 $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) |
108 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
120 $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ |
109 |
121 |
110 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |
122 TARGETS += $(IMAGES_OUTPUTDIR)/jmods/$(MODULE).jmod |
111 |
123 |