1.1 --- a/make/Defs-internal.gmk Thu Feb 21 17:39:58 2013 -0800
1.2 +++ b/make/Defs-internal.gmk Mon Feb 25 15:08:11 2013 -0800
1.3 @@ -100,6 +100,7 @@
1.4 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
1.5 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
1.6 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
1.7 +ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
1.8 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
1.9 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
1.10 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
1.11 @@ -165,6 +166,15 @@
1.12 endif
1.13 endif
1.14
1.15 +NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
1.16 +ifndef BUILD_NASHORN
1.17 + ifdef ALT_NASHORN_DIST
1.18 + BUILD_NASHORN := false
1.19 + else
1.20 + BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
1.21 + endif
1.22 +endif
1.23 +
1.24 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
1.25 ifndef BUILD_DEPLOY
1.26 BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
1.27 @@ -308,6 +318,10 @@
1.28 JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
1.29 ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
1.30 endif
1.31 +ifndef ALT_NASHORN_DIST
1.32 + NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
1.33 + ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
1.34 +endif
1.35
1.36 # Common make arguments (supplied to all component builds)
1.37 COMMON_BUILD_ARGUMENTS = \
