make/Main.gmk
changeset 28811 65cf1b4087cf
parent 28809 6481e27e00ee
child 28899 ceb890ca5f39
equal deleted inserted replaced
28810:86666ec06518 28811:65cf1b4087cf
   210 $(SUPPORT_OUTPUTDIR)/source_tips: FRC
   210 $(SUPPORT_OUTPUTDIR)/source_tips: FRC
   211 	@$(MKDIR) -p $(@D)
   211 	@$(MKDIR) -p $(@D)
   212 	@$(RM) $@
   212 	@$(RM) $@
   213 	@$(call GetSourceTips)
   213 	@$(call GetSourceTips)
   214 
   214 
   215 BOOTCYCLE_TARGET := images
   215 BOOTCYCLE_TARGET := product-images
   216 bootcycle-images:
   216 bootcycle-images:
   217 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
   217 	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
   218 	+$(MAKE) $(MAKE_ARGS) -f Main.gmk SPEC=$(dir $(SPEC))bootcycle-spec.gmk $(BOOTCYCLE_TARGET)
   218 	+$(MAKE) $(MAKE_ARGS) -f Main.gmk SPEC=$(dir $(SPEC))bootcycle-spec.gmk $(BOOTCYCLE_TARGET)
   219 
   219 
   220 zip-security:
   220 zip-security:
   441 $(foreach m, $(COPY_MODULES), $(eval $m: $m-copy))
   441 $(foreach m, $(COPY_MODULES), $(eval $m: $m-copy))
   442 
   442 
   443 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \
   443 ALL_MODULE_TARGETS := $(sort $(GENSRC_MODULES) $(JAVA_MODULES) \
   444     $(GENDATA_MODULES) $(LIBS_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES))
   444     $(GENDATA_MODULES) $(LIBS_MODULES) $(LAUNCHER_MODULES) $(COPY_MODULES))
   445 
   445 
       
   446 # The "exploded image" is a locally runnable JDK in $(BUILD_OUTPUT)/jdk.
   446 exploded-image: $(ALL_MODULE_TARGETS)
   447 exploded-image: $(ALL_MODULE_TARGETS)
   447 # The old 'jdk' target most closely matches the new exploded-image. Keep an
   448 
   448 # alias for ease of use.
   449 # The $(BUILD_OUTPUT)/images directory contain the resulting deliverables, 
       
   450 # and in line with this, our targets for creating these are named *-image[s].
       
   451 
       
   452 # This target builds the product images, e.g. the JRE and JDK image
       
   453 # (and possibly other, more specific versions)
       
   454 product-images: jimages demos samples zip-security verify-modules
       
   455 
       
   456 ifeq ($(OPENJDK_TARGET_OS), macosx)
       
   457   product-images: mac-bundles
       
   458 endif
       
   459 
       
   460 # This target builds the documentation image
       
   461 docs-image: docs-javadoc docs-jvmtidoc
       
   462 
       
   463 # This target builds the test image
       
   464 test-image: prepare-test-image
       
   465 
       
   466 # all-images is the top-most target, it builds all our deliverables ("images").
       
   467 all-images: product-images test-image docs-image
       
   468 
       
   469 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \
       
   470     jdk.jdwp.agent-gensrc $(ALL_MODULE_TARGETS) exploded-image \
       
   471     product-images docs-image test-image all-images
       
   472 
       
   473 ################################################################################
       
   474 
       
   475 # Traditional targets typically run by users.
       
   476 # These can be considered aliases for the targets now named by a more
       
   477 # "modern" naming scheme.
       
   478 default: exploded-image
   449 jdk: exploded-image
   479 jdk: exploded-image
   450 
   480 images: product-images
   451 images: test-image jimages demos samples zip-security verify-modules
   481 docs: docs-image
   452 
   482 all: all-images
   453 ifeq ($(OPENJDK_TARGET_OS), macosx)
   483 
   454   images: mac-bundles
   484 ALL_TARGETS += default jdk images docs all
   455 endif
       
   456 
       
   457 docs: docs-javadoc docs-jvmtidoc
       
   458 
       
   459 test-image: prepare-test-image
       
   460 
       
   461 ALL_TARGETS += buildtools gensrc gendata copy java rmic libs launchers \
       
   462     jdk.jdwp.agent-gensrc $(ALL_MODULE_TARGETS) exploded-image jdk images \
       
   463     docs test-image
       
   464 
       
   465 ################################################################################
       
   466 
       
   467 all: images
       
   468 default: exploded-image
       
   469 
       
   470 ALL_TARGETS += default all
       
   471 
   485 
   472 ################################################################################
   486 ################################################################################
   473 ################################################################################
   487 ################################################################################
   474 #
   488 #
   475 # Clean targets
   489 # Clean targets