--- a/Makefile Wed Jul 05 18:43:54 2017 +0200
+++ b/Makefile Wed Mar 13 23:21:35 2013 -0700
@@ -90,6 +90,7 @@
include ./make/jaxp-rules.gmk
include ./make/jaxws-rules.gmk
include ./make/jdk-rules.gmk
+include ./make/nashorn-rules.gmk
include ./make/install-rules.gmk
include ./make/sponsors-rules.gmk
include ./make/deploy-rules.gmk
@@ -174,6 +175,11 @@
clobber:: jdk-clobber
endif
+ifeq ($(BUILD_NASHORN), true)
+ generic_build_repo_series:: $(NASHORN)
+ clobber:: nashorn-clobber
+endif
+
ifeq ($(BUILD_DEPLOY), true)
generic_build_repo_series:: $(DEPLOY)
clobber:: deploy-clobber
@@ -336,6 +342,7 @@
BUILD_HOTSPOT=false \
BUILD_JDK=false \
BUILD_LANGTOOLS=false \
+ BUILD_NASHORN=false \
BUILD_CORBA=false \
BUILD_JAXP=false \
BUILD_JAXWS=false \
--- a/common/autoconf/generated-configure.sh Wed Jul 05 18:43:54 2017 +0200
+++ b/common/autoconf/generated-configure.sh Wed Mar 13 23:21:35 2013 -0700
@@ -749,6 +749,7 @@
OVERRIDE_SRC_ROOT
ADD_SRC_ROOT
JDK_TOPDIR
+NASHORN_TOPDIR
HOTSPOT_TOPDIR
JAXWS_TOPDIR
JAXP_TOPDIR
@@ -15682,6 +15683,7 @@
JAXP_TOPDIR="$SRC_ROOT/jaxp"
JAXWS_TOPDIR="$SRC_ROOT/jaxws"
HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
+NASHORN_TOPDIR="$SRC_ROOT/nashorn"
JDK_TOPDIR="$SRC_ROOT/jdk"
@@ -15692,6 +15694,7 @@
+
###############################################################################
#
# Pickup additional source for a component from outside of the source root
@@ -15922,6 +15925,19 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
$as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
fi
+if test "x$with_override_nashorn" != x; then
+ CURDIR="$PWD"
+ cd "$with_override_nashorn"
+ NASHORN_TOPDIR="`pwd`"
+ cd "$CURDIR"
+ if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
+ as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
+$as_echo_n "checking if nashorn should be overridden... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
+$as_echo "yes with $NASHORN_TOPDIR" >&6; }
+fi
if test "x$with_override_jdk" != x; then
CURDIR="$PWD"
cd "$with_override_jdk"
@@ -18534,14 +18550,18 @@
### Locate C compiler (CC)
-# gcc is almost always present, but on Windows we
-# prefer cl.exe and on Solaris we prefer CC.
-# Thus test for them in this order.
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # Do not probe for cc on MacOSX.
- COMPILER_CHECK_LIST="cl gcc"
-else
- COMPILER_CHECK_LIST="cl cc gcc"
+# On windows, only cl.exe is supported.
+# On Solaris, cc is preferred to gcc.
+# Elsewhere, gcc is preferred to cc.
+
+if test "x$CC" != x; then
+ COMPILER_CHECK_LIST="$CC"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ COMPILER_CHECK_LIST="cc gcc"
+else
+ COMPILER_CHECK_LIST="gcc cc"
fi
@@ -19505,7 +19525,7 @@
$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
-# Now that we have resolved CC ourself, let autoconf have it's go at it
+# Now that we have resolved CC ourself, let autoconf have its go at it
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20107,12 +20127,16 @@
### Locate C++ compiler (CXX)
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # Do not probe for CC on MacOSX.
- COMPILER_CHECK_LIST="cl g++"
-else
- COMPILER_CHECK_LIST="cl CC g++"
-fi
+if test "x$CXX" != x; then
+ COMPILER_CHECK_LIST="$CXX"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ COMPILER_CHECK_LIST="CC g++"
+else
+ COMPILER_CHECK_LIST="g++ CC"
+fi
+
COMPILER_NAME=C++
@@ -21074,7 +21098,7 @@
$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
-# Now that we have resolved CXX ourself, let autoconf have it's go at it
+# Now that we have resolved CXX ourself, let autoconf have its go at it
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--- a/common/autoconf/source-dirs.m4 Wed Jul 05 18:43:54 2017 +0200
+++ b/common/autoconf/source-dirs.m4 Wed Mar 13 23:21:35 2013 -0700
@@ -33,12 +33,14 @@
JAXP_TOPDIR="$SRC_ROOT/jaxp"
JAXWS_TOPDIR="$SRC_ROOT/jaxws"
HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
+NASHORN_TOPDIR="$SRC_ROOT/nashorn"
JDK_TOPDIR="$SRC_ROOT/jdk"
AC_SUBST(LANGTOOLS_TOPDIR)
AC_SUBST(CORBA_TOPDIR)
AC_SUBST(JAXP_TOPDIR)
AC_SUBST(JAXWS_TOPDIR)
AC_SUBST(HOTSPOT_TOPDIR)
+AC_SUBST(NASHORN_TOPDIR)
AC_SUBST(JDK_TOPDIR)
])
@@ -233,7 +235,18 @@
fi
AC_MSG_CHECKING([if hotspot should be overridden])
AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
-fi
+fi
+if test "x$with_override_nashorn" != x; then
+ CURDIR="$PWD"
+ cd "$with_override_nashorn"
+ NASHORN_TOPDIR="`pwd`"
+ cd "$CURDIR"
+ if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
+ AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
+ fi
+ AC_MSG_CHECKING([if nashorn should be overridden])
+ AC_MSG_RESULT([yes with $NASHORN_TOPDIR])
+fi
if test "x$with_override_jdk" != x; then
CURDIR="$PWD"
cd "$with_override_jdk"
--- a/common/autoconf/spec.gmk.in Wed Jul 05 18:43:54 2017 +0200
+++ b/common/autoconf/spec.gmk.in Wed Mar 13 23:21:35 2013 -0700
@@ -141,6 +141,7 @@
JAXP_TOPDIR:=@JAXP_TOPDIR@
JAXWS_TOPDIR:=@JAXWS_TOPDIR@
HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
+NASHORN_TOPDIR:=@NASHORN_TOPDIR@
COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
# Location where build customization files may be found
@@ -230,6 +231,7 @@
JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
+NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
@@ -238,6 +240,7 @@
JAXP_DIST=$(JAXP_OUTPUTDIR)/dist
JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist
HOTSPOT_DIST=@HOTSPOT_DIST@
+NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist
BUILD_HOTSPOT=@BUILD_HOTSPOT@
--- a/common/autoconf/toolchain.m4 Wed Jul 05 18:43:54 2017 +0200
+++ b/common/autoconf/toolchain.m4 Wed Mar 13 23:21:35 2013 -0700
@@ -249,30 +249,38 @@
### Locate C compiler (CC)
-# gcc is almost always present, but on Windows we
-# prefer cl.exe and on Solaris we prefer CC.
-# Thus test for them in this order.
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # Do not probe for cc on MacOSX.
- COMPILER_CHECK_LIST="cl gcc"
+# On windows, only cl.exe is supported.
+# On Solaris, cc is preferred to gcc.
+# Elsewhere, gcc is preferred to cc.
+
+if test "x$CC" != x; then
+ COMPILER_CHECK_LIST="$CC"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ COMPILER_CHECK_LIST="cc gcc"
else
- COMPILER_CHECK_LIST="cl cc gcc"
+ COMPILER_CHECK_LIST="gcc cc"
fi
TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
-# Now that we have resolved CC ourself, let autoconf have it's go at it
+# Now that we have resolved CC ourself, let autoconf have its go at it
AC_PROG_CC([$CC])
### Locate C++ compiler (CXX)
-if test "x$OPENJDK_TARGET_OS" = xmacosx; then
- # Do not probe for CC on MacOSX.
- COMPILER_CHECK_LIST="cl g++"
+if test "x$CXX" != x; then
+ COMPILER_CHECK_LIST="$CXX"
+elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
+ COMPILER_CHECK_LIST="cl"
+elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
+ COMPILER_CHECK_LIST="CC g++"
else
- COMPILER_CHECK_LIST="cl CC g++"
+ COMPILER_CHECK_LIST="g++ CC"
fi
+
TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
-# Now that we have resolved CXX ourself, let autoconf have it's go at it
+# Now that we have resolved CXX ourself, let autoconf have its go at it
AC_PROG_CXX([$CXX])
### Locate other tools
--- a/common/bin/hgforest.sh Wed Jul 05 18:43:54 2017 +0200
+++ b/common/bin/hgforest.sh Wed Mar 13 23:21:35 2013 -0700
@@ -96,7 +96,7 @@
repos=""
repos_extra=""
if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
- subrepos="corba jaxp jaxws langtools jdk hotspot"
+ subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
if [ -f .hg/hgrc ] ; then
pull_default=`hg paths default`
if [ "${pull_default}" = "" ] ; then
--- a/common/makefiles/Main.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/common/makefiles/Main.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -120,6 +120,12 @@
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
@$(call TargetExit)
+nashorn: jdk nashorn-only
+nashorn-only: start-make
+ @$(call TargetEnter)
+ @($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
+ @$(call TargetExit)
+
demos: jdk demos-only
demos-only: start-make
@$(call TargetEnter)
@@ -128,7 +134,7 @@
# Note: This double-colon rule is intentional, to support
# custom make file integration.
-images:: source-tips demos images-only
+images:: source-tips demos nashorn images-only
images-only: start-make
@$(call TargetEnter)
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
@@ -175,9 +181,10 @@
@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
-test: start-make
+test: images test-only
+test-only: start-make
@$(call TargetEnter)
- @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
+ @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
@$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
@@ -190,7 +197,7 @@
# Remove everything, except the output from configure.
-clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
+clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs
@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
@$(ECHO) Cleaned all build artifacts.
@@ -220,6 +227,8 @@
$(call CleanComponent,hotspot)
clean-jdk:
$(call CleanComponent,jdk)
+clean-nashorn:
+ $(call CleanComponent,nashorn)
clean-images:
$(call CleanComponent,images)
clean-overlay-images:
@@ -230,10 +239,10 @@
$(call CleanComponent,docs)
$(call CleanComponent,docstemp)
-.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
-.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
+.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
+.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
.PHONY: all test clean dist-clean bootcycle-images start-make
-.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
+.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
.PHONY: profiles profiles-only profiles-oscheck
FRC: # Force target
--- a/common/makefiles/MakeBase.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/common/makefiles/MakeBase.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -51,8 +51,9 @@
-e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-e 's|X00|X|g' | tr '\n' '$2'
+# Subst in an extra $ to prevent it from disappearing.
define ListPathsSafely_If
- $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
+ $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
endef
define ListPathsSafely_Printf
--- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -80,7 +80,8 @@
TREEAPI_PKGS = com.sun.source.doctree \
com.sun.source.tree \
- com.sun.source.util
+ com.sun.source.util \
+ jdk
SMARTCARDIO_PKGS = javax.smartcardio
@@ -93,6 +94,8 @@
com.apple.eio
endif
+JDK_PKGS = jdk
+
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(MGMT_PKGS) \
@@ -103,5 +106,5 @@
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
$(SCTPAPI_PKGS) \
- $(APPLE_EXT_PKGS)
-
+ $(APPLE_EXT_PKGS) \
+ $(JDK_PKGS)
--- a/make/Defs-internal.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/make/Defs-internal.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -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 = \
--- a/make/jdk-rules.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/make/jdk-rules.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/nashorn-rules.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -0,0 +1,59 @@
+#
+# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################
+# NASHORN TARGETS
+################################################################
+
+NASHORN_BUILD_ARGUMENTS = \
+ $(COMMON_BUILD_ARGUMENTS) \
+ ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \
+ ALT_BOOTDIR=$(BOOTDIR) \
+ ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
+
+ifeq ($(BUILD_LANGTOOLS), true)
+ NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
+endif
+
+# Default targets
+NASHORN = nashorn-build
+
+nashorn: nashorn-build
+nashorn-build:
+ $(MKDIR) -p $(NASHORN_OUTPUTDIR)
+ @$(call MakeStart,nashorn,all)
+ ($(CD) $(NASHORN_TOPDIR)/make && \
+ $(MAKE) $(NASHORN_BUILD_ARGUMENTS) all)
+ @$(call MakeFinish,nashorn,all)
+
+nashorn-clobber::
+ $(MKDIR) -p $(NASHORN_OUTPUTDIR)
+ @$(call MakeStart,nashorn,clobber)
+ ($(CD) $(NASHORN_TOPDIR)/make && \
+ $(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber)
+ @$(call MakeFinish,nashorn,clobber)
+
+.PHONY: nashorn nashorn-build nashorn-clobber
+
--- a/make/sanity-rules.gmk Wed Jul 05 18:43:54 2017 +0200
+++ b/make/sanity-rules.gmk Wed Mar 13 23:21:35 2013 -0700
@@ -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
--- a/make/scripts/hgforest.sh Wed Jul 05 18:43:54 2017 +0200
+++ b/make/scripts/hgforest.sh Wed Mar 13 23:21:35 2013 -0700
@@ -40,7 +40,7 @@
repos=""
repos_extra=""
if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
- subrepos="corba jaxp jaxws langtools jdk hotspot"
+ subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
if [ -f .hg/hgrc ] ; then
pull_default=`hg paths default`
if [ "${pull_default}" = "" ] ; then
--- a/make/scripts/webrev.ksh Wed Jul 05 18:43:54 2017 +0200
+++ b/make/scripts/webrev.ksh Wed Mar 13 23:21:35 2013 -0700
@@ -3023,7 +3023,7 @@
cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
fi
if [[ -n $WGET ]]; then
- msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"`
+ msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote`
fi
if [[ -z $msg ]]; then
msg="${id}"