98 ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") |
98 ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)") |
99 ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)") |
99 ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)") |
100 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)") |
100 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)") |
101 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)") |
101 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)") |
102 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)") |
102 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)") |
|
103 ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)") |
103 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)") |
104 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)") |
104 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)") |
105 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)") |
105 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)") |
106 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)") |
106 |
107 |
107 # Macro to return true or false if a file exists and is readable |
108 # Macro to return true or false if a file exists and is readable |
160 endif |
161 endif |
161 ifeq ($(JDK_SRC_AVAILABLE),true) |
162 ifeq ($(JDK_SRC_AVAILABLE),true) |
162 JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) |
163 JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed) |
163 ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) |
164 ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false) |
164 OPENJDK = true |
165 OPENJDK = true |
|
166 endif |
|
167 endif |
|
168 |
|
169 NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile) |
|
170 ifndef BUILD_NASHORN |
|
171 ifdef ALT_NASHORN_DIST |
|
172 BUILD_NASHORN := false |
|
173 else |
|
174 BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE) |
165 endif |
175 endif |
166 endif |
176 endif |
167 |
177 |
168 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) |
178 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) |
169 ifndef BUILD_DEPLOY |
179 ifndef BUILD_DEPLOY |
305 ABS_JAXP_DIST = $(JAXP_OUTPUTDIR)/dist |
315 ABS_JAXP_DIST = $(JAXP_OUTPUTDIR)/dist |
306 endif |
316 endif |
307 ifndef ALT_JAXWS_DIST |
317 ifndef ALT_JAXWS_DIST |
308 JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws |
318 JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws |
309 ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist |
319 ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist |
|
320 endif |
|
321 ifndef ALT_NASHORN_DIST |
|
322 NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn |
|
323 ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist |
310 endif |
324 endif |
311 |
325 |
312 # Common make arguments (supplied to all component builds) |
326 # Common make arguments (supplied to all component builds) |
313 COMMON_BUILD_ARGUMENTS = \ |
327 COMMON_BUILD_ARGUMENTS = \ |
314 JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ |
328 JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ |