338 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) |
338 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) |
339 |
339 |
340 docs-jvmtidoc: |
340 docs-jvmtidoc: |
341 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs) |
341 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk jvmtidocs) |
342 |
342 |
|
343 zip-docs: docs-javadoc docs-jvmtidoc |
|
344 +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk zip-docs) |
|
345 |
343 ALL_TARGETS += docs-javadoc docs-jvmtidoc |
346 ALL_TARGETS += docs-javadoc docs-jvmtidoc |
344 |
347 |
345 ################################################################################ |
348 ################################################################################ |
346 # Cross compilation support |
349 # Cross compilation support |
347 |
350 |
390 test-image-jdk-jtreg-native) |
393 test-image-jdk-jtreg-native) |
391 |
394 |
392 build-test-lib: |
395 build-test-lib: |
393 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk) |
396 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f BuildTestLib.gmk) |
394 |
397 |
395 # Builds the failure handler jtreg extension |
398 ifeq ($(BUILD_FAILURE_HANDLER), true) |
396 build-test-failure-handler: |
399 # Builds the failure handler jtreg extension |
|
400 build-test-failure-handler: |
397 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
401 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
398 -f BuildFailureHandler.gmk build) |
402 -f BuildFailureHandler.gmk build) |
399 |
403 |
400 # Runs the tests for the failure handler jtreg extension |
404 # Runs the tests for the failure handler jtreg extension |
401 test-failure-handler: |
405 test-failure-handler: |
402 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
406 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
403 -f BuildFailureHandler.gmk test) |
407 -f BuildFailureHandler.gmk test) |
404 |
408 |
405 # Copies the failure handler jtreg extension into the test image |
409 # Copies the failure handler jtreg extension into the test image |
406 test-image-failure-handler: |
410 test-image-failure-handler: |
407 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
411 +($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) \ |
408 -f BuildFailureHandler.gmk images) |
412 -f BuildFailureHandler.gmk images) |
|
413 endif |
409 |
414 |
410 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
415 ALL_TARGETS += prepare-test-image build-test-hotspot-jtreg-native \ |
411 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
416 test-image-hotspot-jtreg-native build-test-jdk-jtreg-native \ |
412 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
417 test-image-jdk-jtreg-native build-test-lib build-test-failure-handler \ |
413 test-failure-handler test-image-failure-handler |
418 test-failure-handler test-image-failure-handler |
696 ifeq ($(OPENJDK_TARGET_OS), macosx) |
701 ifeq ($(OPENJDK_TARGET_OS), macosx) |
697 product-images: mac-bundles |
702 product-images: mac-bundles |
698 endif |
703 endif |
699 |
704 |
700 # This target builds the documentation image |
705 # This target builds the documentation image |
701 docs-image: docs-javadoc docs-jvmtidoc |
706 docs-image: zip-docs |
702 |
707 |
703 # This target builds the test image |
708 # This target builds the test image |
704 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
709 test-image: prepare-test-image test-image-hotspot-jtreg-native \ |
705 test-image-jdk-jtreg-native test-image-failure-handler |
710 test-image-jdk-jtreg-native test-image-failure-handler |
706 |
711 |