equal
deleted
inserted
replaced
327 $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ |
327 $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \ |
328 sun/tools/serialver/resources)) |
328 sun/tools/serialver/resources)) |
329 |
329 |
330 ################################################################################ |
330 ################################################################################ |
331 |
331 |
332 jdk.jcmd_COPY := _options |
332 jdk.jcmd_COPY := _options |
333 |
333 |
334 ################################################################################ |
334 ################################################################################ |
335 |
335 |
336 jdk.javadoc_COPY := .xml .css .js |
336 jdk.javadoc_COPY := .xml .css .js |
337 |
337 |
431 $(SUPPORT_OUTPUTDIR)/gensrc/$1 \ |
431 $(SUPPORT_OUTPUTDIR)/gensrc/$1 \ |
432 $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$1 \ |
432 $(SUPPORT_OUTPUTDIR)/gensrc_no_docs/$1 \ |
433 # |
433 # |
434 |
434 |
435 OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes |
435 OS_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS)/classes |
436 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_API_DIR)) |
436 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
437 OS_API_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_API_DIR)/classes |
437 OS_TYPE_SRC_DIRS += $(JDK_TOPDIR)/src/$1/$(OPENJDK_TARGET_OS_TYPE)/classes |
438 endif |
438 endif |
439 |
439 |
440 SHARE_SRC_DIRS += \ |
440 SHARE_SRC_DIRS += \ |
441 $(JDK_TOPDIR)/src/$1/share/classes \ |
441 $(JDK_TOPDIR)/src/$1/share/classes \ |
442 $(LANGTOOLS_TOPDIR)/src/$1/share/classes \ |
442 $(LANGTOOLS_TOPDIR)/src/$1/share/classes \ |
446 # |
446 # |
447 |
447 |
448 ALL_SRC_DIRS = \ |
448 ALL_SRC_DIRS = \ |
449 $(GENERATED_SRC_DIRS) \ |
449 $(GENERATED_SRC_DIRS) \ |
450 $(OS_SRC_DIRS) \ |
450 $(OS_SRC_DIRS) \ |
451 $(OS_API_SRC_DIRS) \ |
451 $(OS_TYPE_SRC_DIRS) \ |
452 $(SHARE_SRC_DIRS) \ |
452 $(SHARE_SRC_DIRS) \ |
453 # |
453 # |
454 |
454 |
455 # Find all modules with java sources. Filter out nashorn since it needs to be |
455 # Find all modules with java sources. Filter out nashorn since it needs to be |
456 # compiled separately. |
456 # compiled separately. |
468 define SetupModuleCompilation |
468 define SetupModuleCompilation |
469 # Find the module dependencies by parsing modules.list file |
469 # Find the module dependencies by parsing modules.list file |
470 $1_DEPS := $$(call FindDepsForModule, $1) |
470 $1_DEPS := $$(call FindDepsForModule, $1) |
471 |
471 |
472 $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS)) |
472 $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS)) |
473 # When crypto classes are prebuilt, need to look for classes already in |
473 # When crypto classes are prebuilt, need to look for classes already in |
474 # output dir. |
474 # output dir. |
475 ifneq ($(BUILD_CRYPTO), true) |
475 ifneq ($(BUILD_CRYPTO), true) |
476 $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1 |
476 $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1 |
477 endif |
477 endif |
478 ifeq ($1, jdk.hotspot.agent) |
478 ifeq ($1, jdk.hotspot.agent) |
493 |
493 |
494 $1: $$($1) $$($1_COPY_EXTRA) |
494 $1: $$($1) $$($1_COPY_EXTRA) |
495 |
495 |
496 # Declare dependencies between java compilation of different modules. |
496 # Declare dependencies between java compilation of different modules. |
497 # Since not all modules have been declared yet, or might be declared |
497 # Since not all modules have been declared yet, or might be declared |
498 # in different invocations of this file, use the macro to find the |
498 # in different invocations of this file, use the macro to find the |
499 # correct target file to depend on. |
499 # correct target file to depend on. |
500 # Only the javac compilation actually depends on other modules so limit |
500 # Only the javac compilation actually depends on other modules so limit |
501 # dependency declaration to that by using the *_COMPILE_TARGET variable. |
501 # dependency declaration to that by using the *_COMPILE_TARGET variable. |
502 $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \ |
502 $$($1_COMPILE_TARGETS): $$(foreach d,$$($1_DEPS), \ |
503 $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d)) |
503 $$(call SetupJavaCompilationCompileTarget, $$d, $(JDK_OUTPUTDIR)/modules/$$d)) |