8008447: Tweaks to make all NEWBUILD=false round 3
Reviewed-by: jjh, sundar
Contributed-by: james.laskey@oracle.com
--- a/make/jdk-rules.gmk Tue Feb 19 10:02:55 2013 -0400
+++ b/make/jdk-rules.gmk Thu Feb 21 15:25:31 2013 -0400
@@ -62,6 +62,9 @@
ifeq ($(BUILD_JAXWS), true)
JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
endif
+ifeq ($(BUILD_NASHORN), true)
+ JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
+endif
ifeq ($(BUILD_HOTSPOT), true)
JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
--- a/make/sanity-rules.gmk Tue Feb 19 10:02:55 2013 -0400
+++ b/make/sanity-rules.gmk Thu Feb 21 15:25:31 2013 -0400
@@ -182,6 +182,14 @@
"" >> $(WARNING_FILE)
endif
endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+ ifneq ($(BUILD_NASHORN), true)
+ @$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
+ " The nashorn files will be obtained from \n" \
+ " the location set in ALT_JDK_IMPORT_PATH. \n" \
+ "" >> $(WARNING_FILE)
+ endif
+endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
ifneq ($(BUILD_DEPLOY), true)
@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
@@ -268,6 +276,9 @@
ifeq ($(JDK_SRC_AVAILABLE), true)
@$(ECHO) " JDK_TOPDIR = $(JDK_TOPDIR)" >> $(MESSAGE_FILE)
endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+ @$(ECHO) " NASHORN_TOPDIR = $(NASHORN_TOPDIR)" >> $(MESSAGE_FILE)
+endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
@$(ECHO) " DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)" >> $(MESSAGE_FILE)
endif
@@ -303,6 +314,9 @@
ifeq ($(JDK_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_JDK = $(BUILD_JDK) " >> $(MESSAGE_FILE)
endif
+ifeq ($(NASHORN_SRC_AVAILABLE), true)
+ @$(ECHO) " BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
+endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_DEPLOY = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
endif