1.1 --- a/common/makefiles/Main.gmk Thu Mar 07 11:17:28 2013 -0800
1.2 +++ b/common/makefiles/Main.gmk Tue Mar 12 16:38:11 2013 -0700
1.3 @@ -120,6 +120,12 @@
1.4 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
1.5 @$(call TargetExit)
1.6
1.7 +nashorn: jdk nashorn-only
1.8 +nashorn-only: start-make
1.9 + @$(call TargetEnter)
1.10 + @($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
1.11 + @$(call TargetExit)
1.12 +
1.13 demos: jdk demos-only
1.14 demos-only: start-make
1.15 @$(call TargetEnter)
1.16 @@ -128,7 +134,7 @@
1.17
1.18 # Note: This double-colon rule is intentional, to support
1.19 # custom make file integration.
1.20 -images:: source-tips demos images-only
1.21 +images:: source-tips demos nashorn images-only
1.22 images-only: start-make
1.23 @$(call TargetEnter)
1.24 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
1.25 @@ -175,9 +181,10 @@
1.26 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
1.27 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
1.28
1.29 -test: start-make
1.30 +test: images test-only
1.31 +test-only: start-make
1.32 @$(call TargetEnter)
1.33 - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
1.34 + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
1.35 @$(call TargetExit)
1.36
1.37 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
1.38 @@ -190,7 +197,7 @@
1.39
1.40
1.41 # Remove everything, except the output from configure.
1.42 -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
1.43 +clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs
1.44 @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
1.45 @$(ECHO) Cleaned all build artifacts.
1.46
1.47 @@ -220,6 +227,8 @@
1.48 $(call CleanComponent,hotspot)
1.49 clean-jdk:
1.50 $(call CleanComponent,jdk)
1.51 +clean-nashorn:
1.52 + $(call CleanComponent,nashorn)
1.53 clean-images:
1.54 $(call CleanComponent,images)
1.55 clean-overlay-images:
1.56 @@ -230,10 +239,10 @@
1.57 $(call CleanComponent,docs)
1.58 $(call CleanComponent,docstemp)
1.59
1.60 -.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
1.61 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
1.62 +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
1.63 +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
1.64 .PHONY: all test clean dist-clean bootcycle-images start-make
1.65 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
1.66 +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
1.67 .PHONY: profiles profiles-only profiles-oscheck
1.68
1.69 FRC: # Force target
