142 JAVA_MODULES := $(call FindJavaModules) |
142 JAVA_MODULES := $(call FindJavaModules) |
143 JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES)) |
143 JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES)) |
144 |
144 |
145 define DeclareCompileJavaRecipe |
145 define DeclareCompileJavaRecipe |
146 $1-java: |
146 $1-java: |
147 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CompileJavaModules.gmk \ |
147 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \ |
148 $1 JAVA_MODULES=$1 MODULE=$1) |
148 -f CompileJavaModules.gmk MODULE=$1) |
149 endef |
149 endef |
150 |
150 |
151 $(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \ |
151 $(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \ |
152 $(eval $(call DeclareCompileJavaRecipe,$m))) |
152 $(eval $(call DeclareCompileJavaRecipe,$m))) |
153 |
153 |
154 # Build nashorn. Needs to be compiled separately from the rest of the modules |
154 # Build nashorn. Needs to be compiled separately from the rest of the modules |
155 # due to nasgen. |
155 # due to nasgen. |
156 jdk.scripting.nashorn-java: |
156 jdk.scripting.nashorn-java: |
157 +($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk compile) |
157 +($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \ |
|
158 -f BuildNashorn.gmk compile) |
158 |
159 |
159 ALL_TARGETS += $(JAVA_TARGETS) |
160 ALL_TARGETS += $(JAVA_TARGETS) |
160 |
161 |
161 ################################################################################ |
162 ################################################################################ |
162 # Targets for running rmic. |
163 # Targets for running rmic. |
193 ################################################################################ |
194 ################################################################################ |
194 # Build hotspot target |
195 # Build hotspot target |
195 |
196 |
196 ifeq ($(BUILD_HOTSPOT),true) |
197 ifeq ($(BUILD_HOTSPOT),true) |
197 hotspot: |
198 hotspot: |
198 ($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk) |
199 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk) |
199 endif |
200 endif |
200 |
201 |
201 ALL_TARGETS += hotspot |
202 ALL_TARGETS += hotspot |
202 |
203 |
203 ################################################################################ |
204 ################################################################################ |
509 # Explicitly declare dependency for virtual target jdk.jdwp.agent-gensrc which |
510 # Explicitly declare dependency for virtual target jdk.jdwp.agent-gensrc which |
510 # is actually handled by jdk.jdi-gensrc |
511 # is actually handled by jdk.jdi-gensrc |
511 jdk.jdwp.agent-gensrc: jdk.jdi-gensrc |
512 jdk.jdwp.agent-gensrc: jdk.jdi-gensrc |
512 |
513 |
513 # Declare dependencies from <module> to all the individual targets specific |
514 # Declare dependencies from <module> to all the individual targets specific |
514 # to that module <module>-*. |
515 # to that module <module>-*, that are needed for the exploded image. |
515 $(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc)) |
516 $(foreach m, $(GENSRC_MODULES), $(eval $m: $m-gensrc)) |
516 $(foreach m, $(JAVA_MODULES), $(eval $m: $m-java)) |
517 $(foreach m, $(JAVA_MODULES), $(eval $m: $m-java)) |
517 $(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata)) |
518 $(foreach m, $(GENDATA_MODULES), $(eval $m: $m-gendata)) |
518 $(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic)) |
519 $(foreach m, $(RMIC_MODULES), $(eval $m: $m-rmic)) |
519 $(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs)) |
520 $(foreach m, $(LIBS_MODULES), $(eval $m: $m-libs)) |
520 $(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers)) |
521 $(foreach m, $(LAUNCHER_MODULES), $(eval $m: $m-launchers)) |
521 $(foreach m, $(COPY_MODULES), $(eval $m: $m-copy)) |
522 $(foreach m, $(COPY_MODULES), $(eval $m: $m-copy)) |
522 |
523 |
523 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \ |
|
524 $(GENDATA_MODULES) $(LIBS_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES)) |
|
525 |
|
526 demos: demos-jdk |
524 demos: demos-jdk |
527 |
525 |
528 samples: samples-jdk |
526 samples: samples-jdk |
529 |
527 |
530 # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk. |
528 # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk. |
531 exploded-image: $(ALL_MODULE_TARGETS) |
529 exploded-image: $(ALL_MODULES) |
532 |
530 |
533 mac-bundles: mac-bundles-jdk |
531 mac-bundles: mac-bundles-jdk |
534 |
532 |
535 # The $(BUILD_OUTPUT)/images directory contain the resulting deliverables, |
533 # The $(BUILD_OUTPUT)/images directory contain the resulting deliverables, |
536 # and in line with this, our targets for creating these are named *-image[s]. |
534 # and in line with this, our targets for creating these are named *-image[s]. |
552 |
550 |
553 # all-images is the top-most target, it builds all our deliverables ("images"). |
551 # all-images is the top-most target, it builds all our deliverables ("images"). |
554 all-images: product-images test-image docs-image |
552 all-images: product-images test-image docs-image |
555 |
553 |
556 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \ |
554 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \ |
557 jdk.jdwp.agent-gensrc $(ALL_MODULE_TARGETS) demos samples exploded-image \ |
555 jdk.jdwp.agent-gensrc $(ALL_MODULES) demos samples exploded-image \ |
558 mac-bundles product-images docs-image test-image all-images |
556 mac-bundles product-images docs-image test-image all-images |
559 |
557 |
560 ################################################################################ |
558 ################################################################################ |
561 |
559 |
562 # Traditional targets typically run by users. |
560 # Traditional targets typically run by users. |