Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/JavaCompilation.gmk	Tue Oct 15 13:39:42 2013 +0100
     1.2 +++ b/common/makefiles/JavaCompilation.gmk	Wed Oct 16 13:50:05 2013 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -371,8 +371,8 @@
    1.11      #    INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
    1.12      #    EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
    1.13      #                   "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
    1.14 -    #    JAVAC_SOURCE_PATH_UGLY_OVERRIDE:=Don't use this. This forces an explicit -sourcepath to javac.
    1.15 -    #                                     Its only here until we cleanup some nasty source code pasta in the jdk.
    1.16 +  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
    1.17 +  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
    1.18      #    HEADERS:=path to directory where all generated c-headers are written.
    1.19      #    DEPENDS:=Extra dependecy
    1.20      $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
    1.21 @@ -474,8 +474,8 @@
    1.22      endif
    1.23  
    1.24      # Prep the source paths.
    1.25 -    ifneq ($$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE),)
    1.26 -      $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_UGLY_OVERRIDE)))
    1.27 +  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
    1.28 +    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
    1.29      else
    1.30        $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
    1.31      endif

     2.1 --- a/common/makefiles/RMICompilation.gmk	Tue Oct 15 13:39:42 2013 +0100
     2.2 +++ b/common/makefiles/RMICompilation.gmk	Wed Oct 16 13:50:05 2013 +0200
     2.3 @@ -38,7 +38,7 @@
     2.4      $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
     2.5      $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
     2.6  
     2.7 -    $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/$1_rmic
     2.8 +  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
     2.9  
    2.10      $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
    2.11      $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
    2.12 @@ -88,10 +88,9 @@
    2.13  	    $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
    2.14  			-d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES);\
    2.15  	fi;
    2.16 +	$(TOUCH) $$@
    2.17  
    2.18  
    2.19 -    $1 := $$($1_TARGETS)
    2.20 +  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
    2.21  
    2.22 -    # By marking as secondary, this "touch" file doesn't need to be touched and will never exist.
    2.23 -    .SECONDARY: $$($1_DEP_FILE)
    2.24  endef