Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Thu Dec 05 15:12:22 2013 -0800
     1.2 +++ b/.hgtags	Thu Dec 12 11:04:54 2013 -0800
     1.3 @@ -241,3 +241,4 @@
     1.4  a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
     1.5  0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
     1.6  9e90215673be68a3e77a9e444e4232076373734d jdk8-b119
     1.7 +cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120

     2.1 --- a/Makefile	Thu Dec 05 15:12:22 2013 -0800
     2.2 +++ b/Makefile	Thu Dec 12 11:04:54 2013 -0800
     2.3 @@ -66,12 +66,12 @@
     2.4      # First, find out the valid targets
     2.5      # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
     2.6      # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
     2.7 -    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
     2.8 -        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
     2.9 +    all_phony_targets=$(filter-out $(global_targets) bundles bundles-only final-images-only, $(strip $(shell \
    2.10 +        cd $(root_dir) && $(MAKE) -p -q FRC SPEC=$(firstword $(SPEC)) | \
    2.11          grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    2.12  
    2.13      $(all_phony_targets):
    2.14 -	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    2.15 +	@$(foreach spec,$(SPEC),(cd $(root_dir) && $(MAKE) SPEC=$(spec) \
    2.16  	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    2.17  
    2.18      .PHONY: $(all_phony_targets)

     3.1 --- a/common/autoconf/spec.gmk.in	Thu Dec 05 15:12:22 2013 -0800
     3.2 +++ b/common/autoconf/spec.gmk.in	Thu Dec 12 11:04:54 2013 -0800
     3.3 @@ -237,7 +237,6 @@
     3.4  JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
     3.5  NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
     3.6  IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
     3.7 -JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
     3.8  
     3.9  LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist
    3.10  CORBA_DIST=$(CORBA_OUTPUTDIR)/dist

     4.1 --- a/make/MakeHelpers.gmk	Thu Dec 05 15:12:22 2013 -0800
     4.2 +++ b/make/MakeHelpers.gmk	Thu Dec 12 11:04:54 2013 -0800
     4.3 @@ -50,7 +50,7 @@
     4.4  
     4.5  # Global targets are possible to run either with or without a SPEC. The prototypical
     4.6  # global target is "help".
     4.7 -global_targets=help jprt% bridgeBuild
     4.8 +global_targets=help jprt% bridgeBuild bridge2configure
     4.9  
    4.10  ##############################
    4.11  # Functions