103 ifneq ($(INTERIM_JMOD), true) |
103 ifneq ($(INTERIM_JMOD), true) |
104 ALL_UPGRADEABLE_MODULES := $(call FindAllUpgradeableModules) |
104 ALL_UPGRADEABLE_MODULES := $(call FindAllUpgradeableModules) |
105 DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ |
105 DEPS += $(patsubst %, $(JMODS_DIR)/%.jmod, \ |
106 $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) |
106 $(filter-out java.base $(ALL_UPGRADEABLE_MODULES), $(call FindAllModules))) |
107 |
107 |
108 EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES)))) |
108 EXCLUDE_PATTERN := $(strip $(subst $(SPACE),$$|,$(strip $(ALL_UPGRADEABLE_MODULES)))) |
109 |
109 |
110 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
110 JMOD_FLAGS += --module-path $(JMODS_DIR) \ |
111 --hash-modules '^(?!$(EXCLUDE_PATTERN))' |
111 --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)' |
112 endif |
112 endif |
113 endif |
113 endif |
114 endif |
114 endif |
115 |
115 |
116 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. |
116 # Changes to the jmod tool itself should also trigger a rebuild of all jmods. |
133 $(call LogWarn, Creating $(patsubst $(OUTPUT_ROOT)/%, %, $@)) |
133 $(call LogWarn, Creating $(patsubst $(OUTPUT_ROOT)/%, %, $@)) |
134 $(call MakeDir, $(JMODS_DIR) $(JMODS_TEMPDIR)) |
134 $(call MakeDir, $(JMODS_DIR) $(JMODS_TEMPDIR)) |
135 $(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@) |
135 $(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@) |
136 $(JMOD) create \ |
136 $(JMOD) create \ |
137 --module-version $(VERSION_SHORT) \ |
137 --module-version $(VERSION_SHORT) \ |
138 --os-name $(REQUIRED_OS_NAME) \ |
138 --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \ |
139 --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ |
|
140 --os-version $(REQUIRED_OS_VERSION) \ |
|
141 --module-path $(JMODS_DIR) \ |
139 --module-path $(JMODS_DIR) \ |
142 --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ |
140 --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ |
143 $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) |
141 $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@) |
144 $(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@ |
142 $(MV) $(JMODS_TEMPDIR)/$(notdir $@) $@ |
145 |
143 |
146 TARGETS += $(JMODS_DIR)/$(MODULE).jmod |
144 TARGETS += $(JMODS_DIR)/$(MODULE).jmod |
147 |
145 |