169 endif |
169 endif |
170 SRC_SUBDIRS += share/classes |
170 SRC_SUBDIRS += share/classes |
171 |
171 |
172 # Find all module-info.java files for the current build target platform and |
172 # Find all module-info.java files for the current build target platform and |
173 # configuration. |
173 # configuration. |
|
174 # TODO: The $(firstword call is part of a workaround for using different |
|
175 # imported module-info.java in Jake due to a change in format. Remove once |
|
176 # new format is standard in JDK 9 and javafx delivers just that. |
174 # Param 1 - Module to find for, set to * for finding all |
177 # Param 1 - Module to find for, set to * for finding all |
175 FindAllModuleInfos = \ |
178 FindAllModuleInfos = \ |
176 $(wildcard \ |
179 $(wildcard \ |
177 $(foreach sub, $(SRC_SUBDIRS), \ |
180 $(foreach sub, $(SRC_SUBDIRS), \ |
178 $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \ |
181 $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \ |
179 $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))) |
182 $(patsubst %,%/$(strip $1)/module-info.java, $(firstword $(IMPORT_MODULES_SRC)))) |
180 |
183 |
181 # Find module-info.java files in the specific source dir |
184 # Find module-info.java files in the specific source dir |
182 # Param 1 - Src dir to find module-info.java files in |
185 # Param 1 - Src dir to find module-info.java files in |
183 FindModuleInfosForSrcDir = \ |
186 FindModuleInfosForSrcDir = \ |
184 $(wildcard \ |
187 $(wildcard \ |
242 ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \ |
245 ( $(PRINTF) "DEPS_$(call GetModuleNameFromModuleInfo, $m) :=" && \ |
243 $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\ |
246 $(NAWK) -v MODULE=$(call GetModuleNameFromModuleInfo, $m) '\ |
244 BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ |
247 BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ |
245 /requires/ { sub(/;/, ""); \ |
248 /requires/ { sub(/;/, ""); \ |
246 sub(/requires/, ""); \ |
249 sub(/requires/, ""); \ |
247 sub(/public/, ""); \ |
250 sub(/transitive/, ""); \ |
248 sub(/\/\/.*/, ""); \ |
251 sub(/\/\/.*/, ""); \ |
249 sub(/\/\*.*\*\//, ""); \ |
252 sub(/\/\*.*\*\//, ""); \ |
250 gsub(/^ +\*.*/, ""); \ |
253 gsub(/^ +\*.*/, ""); \ |
251 gsub(/ /, ""); \ |
254 gsub(/ /, ""); \ |
252 printf(" %s", $$0) } \ |
255 printf(" %s", $$0) } \ |