Mercurial > hg > openjdk > lambda

changeset 973:f9a1cb245484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8008446: Tweaks to make all NEWBUILD=false round 2 Reviewed-by: jjh Contributed-by: james.laskey@oracle.com
author jlaskey
date Tue, 19 Feb 2013 10:02:55 -0400
parents 8b19b55f695d
children 887fde71977e
files make/Defs-internal.gmk
diffstat 1 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/Defs-internal.gmk	Mon Feb 18 19:01:59 2013 -0400
+++ b/make/Defs-internal.gmk	Tue Feb 19 10:02:55 2013 -0400
@@ -100,6 +100,7 @@
 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
+ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
@@ -165,6 +166,15 @@
   endif
 endif
 
+NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
+ifndef BUILD_NASHORN
+  ifdef ALT_NASHORN_DIST
+    BUILD_NASHORN := false
+  else
+    BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
+  endif
+endif
+
 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
 ifndef BUILD_DEPLOY
   BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
@@ -308,6 +318,10 @@
   JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
   ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
 endif
+ifndef ALT_NASHORN_DIST
+  NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
+  ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
+endif
 
 # Common make arguments (supplied to all component builds)
 COMMON_BUILD_ARGUMENTS = \