485 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) 486 487 ifeq ($(MODULE), jdk.vm.ci) 488 ## WORKAROUND jdk.vm.ci source structure issue 489 JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ 490 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ 491 $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src))) 492 MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) 493 endif 494 495 $(eval $(call SetupJavaCompilation, $(MODULE), \ 496 SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \ 497 MODULE := $(MODULE), \ 498 SRC := $(wildcard $(MODULE_SRC_DIRS)), \ 499 INCLUDES := $(JDK_USER_DEFINED_FILTER), \ 500 FAIL_NO_SRC := $(FAIL_NO_SRC), \ 501 BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ 502 HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ 503 ADD_JAVAC_FLAGS := \ 504 $($(MODULE)_ADD_JAVAC_FLAGS) \ 505 -modulesourcepath $(MODULESOURCEPATH) \ 506 -modulepath $(MODULEPATH) \ 507 -system none, \ 508 )) 509 510 TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) 511 512 # Declare dependencies between java compilations of different modules. 513 # Since the other modules are declared in different invocations of this file, 514 # use the macro to find the correct target file to depend on. 515 # Only the javac compilation actually depends on other modules so limit 516 # dependency declaration to that by using the *_COMPILE_TARGET variable. 517 $($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ 518 $(call SetupJavaCompilationCompileTarget, $d, \ 519 $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) 520 521 ################################################################################ 522 # Copy zh_HK properties files from zh_TW 523 524 $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties 525 $(install-file) 526 | 485 MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES)) 486 487 ifeq ($(MODULE), jdk.vm.ci) 488 ## WORKAROUND jdk.vm.ci source structure issue 489 JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \ 490 $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \ 491 $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src))) 492 MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH)) 493 endif 494 495 $(eval $(call SetupJavaCompilation, $(MODULE), \ 496 SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \ 497 MODULE := $(MODULE), \ 498 SRC := $(wildcard $(MODULE_SRC_DIRS)), \ 499 INCLUDES := $(JDK_USER_DEFINED_FILTER), \ 500 FAIL_NO_SRC := $(FAIL_NO_SRC), \ 501 BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \ 502 HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \ 503 ADD_JAVAC_FLAGS := \ 504 $($(MODULE)_ADD_JAVAC_FLAGS) \ 505 --module-source-path $(MODULESOURCEPATH) \ 506 --module-path $(MODULEPATH) \ 507 -system none, \ 508 )) 509 510 TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA) 511 512 # Declare dependencies between java compilations of different modules. 513 # Since the other modules are declared in different invocations of this file, 514 # use the macro to find the correct target file to depend on. 515 # Only the javac compilation actually depends on other modules so limit 516 # dependency declaration to that by using the *_COMPILE_TARGET variable. 517 $($(MODULE)_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, $(MODULE)), \ 518 $(call SetupJavaCompilationCompileTarget, $d, \ 519 $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d))) 520 521 ################################################################################ 522 # Copy zh_HK properties files from zh_TW 523 524 $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.properties 525 $(install-file) 526 |