8008447: Tweaks to make all NEWBUILD=false round 3

Thu, 21 Feb 2013 15:25:31 -0400

author
jlaskey
date
Thu, 21 Feb 2013 15:25:31 -0400
changeset 882
887fde71977e
parent 881
f9a1cb245484
child 883
e877cb3eb4d6

8008447: Tweaks to make all NEWBUILD=false round 3
Reviewed-by: jjh, sundar
Contributed-by: james.laskey@oracle.com

make/jdk-rules.gmk file | annotate | diff | comparison | revisions
make/sanity-rules.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/make/jdk-rules.gmk	Tue Feb 19 10:02:55 2013 -0400
     1.2 +++ b/make/jdk-rules.gmk	Thu Feb 21 15:25:31 2013 -0400
     1.3 @@ -62,6 +62,9 @@
     1.4  ifeq ($(BUILD_JAXWS), true)
     1.5    JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
     1.6  endif
     1.7 +ifeq ($(BUILD_NASHORN), true)
     1.8 +  JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
     1.9 +endif
    1.10  
    1.11  ifeq ($(BUILD_HOTSPOT), true)
    1.12    JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
     2.1 --- a/make/sanity-rules.gmk	Tue Feb 19 10:02:55 2013 -0400
     2.2 +++ b/make/sanity-rules.gmk	Thu Feb 21 15:25:31 2013 -0400
     2.3 @@ -182,6 +182,14 @@
     2.4  	   "" >> $(WARNING_FILE)
     2.5    endif
     2.6  endif
     2.7 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
     2.8 +  ifneq ($(BUILD_NASHORN), true)
     2.9 +	@$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
    2.10 +           "        The nashorn files will be obtained from \n" \
    2.11 +           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
    2.12 +           "" >> $(WARNING_FILE)
    2.13 +  endif
    2.14 +endif
    2.15  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    2.16    ifneq ($(BUILD_DEPLOY), true)
    2.17  	@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
    2.18 @@ -268,6 +276,9 @@
    2.19  ifeq ($(JDK_SRC_AVAILABLE), true)
    2.20  	@$(ECHO) "   JDK_TOPDIR = $(JDK_TOPDIR)"  >> $(MESSAGE_FILE)
    2.21  endif
    2.22 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
    2.23 +	@$(ECHO) "   NASHORN_TOPDIR = $(NASHORN_TOPDIR)"  >> $(MESSAGE_FILE)
    2.24 +endif
    2.25  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    2.26  	@$(ECHO) "   DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)"  >> $(MESSAGE_FILE)
    2.27  endif
    2.28 @@ -303,6 +314,9 @@
    2.29  ifeq ($(JDK_SRC_AVAILABLE), true)
    2.30  	@$(ECHO) "   BUILD_JDK    = $(BUILD_JDK) " >> $(MESSAGE_FILE)
    2.31  endif
    2.32 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
    2.33 +	@$(ECHO) "   BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
    2.34 +endif
    2.35  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    2.36  	@$(ECHO) "   BUILD_DEPLOY  = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
    2.37  endif

mercurial