Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 13 Mar 2013 23:21:35 -0700
- author
- lana
- date
- Wed, 13 Mar 2013 23:21:35 -0700
- changeset 654
- 22b9a31a92eb
- parent 639
- 145dbc56f931
- parent 653
- 980ccff2d4f5
- child 655
- a69761ae281b
Merge
1.1 --- a/Makefile Tue Mar 12 22:08:13 2013 -0700 1.2 +++ b/Makefile Wed Mar 13 23:21:35 2013 -0700 1.3 @@ -90,6 +90,7 @@ 1.4 include ./make/jaxp-rules.gmk 1.5 include ./make/jaxws-rules.gmk 1.6 include ./make/jdk-rules.gmk 1.7 +include ./make/nashorn-rules.gmk 1.8 include ./make/install-rules.gmk 1.9 include ./make/sponsors-rules.gmk 1.10 include ./make/deploy-rules.gmk 1.11 @@ -174,6 +175,11 @@ 1.12 clobber:: jdk-clobber 1.13 endif 1.14 1.15 +ifeq ($(BUILD_NASHORN), true) 1.16 + generic_build_repo_series:: $(NASHORN) 1.17 + clobber:: nashorn-clobber 1.18 +endif 1.19 + 1.20 ifeq ($(BUILD_DEPLOY), true) 1.21 generic_build_repo_series:: $(DEPLOY) 1.22 clobber:: deploy-clobber 1.23 @@ -336,6 +342,7 @@ 1.24 BUILD_HOTSPOT=false \ 1.25 BUILD_JDK=false \ 1.26 BUILD_LANGTOOLS=false \ 1.27 + BUILD_NASHORN=false \ 1.28 BUILD_CORBA=false \ 1.29 BUILD_JAXP=false \ 1.30 BUILD_JAXWS=false \
2.1 --- a/common/autoconf/generated-configure.sh Tue Mar 12 22:08:13 2013 -0700 2.2 +++ b/common/autoconf/generated-configure.sh Wed Mar 13 23:21:35 2013 -0700 2.3 @@ -749,6 +749,7 @@ 2.4 OVERRIDE_SRC_ROOT 2.5 ADD_SRC_ROOT 2.6 JDK_TOPDIR 2.7 +NASHORN_TOPDIR 2.8 HOTSPOT_TOPDIR 2.9 JAXWS_TOPDIR 2.10 JAXP_TOPDIR 2.11 @@ -15682,6 +15683,7 @@ 2.12 JAXP_TOPDIR="$SRC_ROOT/jaxp" 2.13 JAXWS_TOPDIR="$SRC_ROOT/jaxws" 2.14 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 2.15 +NASHORN_TOPDIR="$SRC_ROOT/nashorn" 2.16 JDK_TOPDIR="$SRC_ROOT/jdk" 2.17 2.18 2.19 @@ -15692,6 +15694,7 @@ 2.20 2.21 2.22 2.23 + 2.24 ############################################################################### 2.25 # 2.26 # Pickup additional source for a component from outside of the source root 2.27 @@ -15922,6 +15925,19 @@ 2.28 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 2.29 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } 2.30 fi 2.31 +if test "x$with_override_nashorn" != x; then 2.32 + CURDIR="$PWD" 2.33 + cd "$with_override_nashorn" 2.34 + NASHORN_TOPDIR="`pwd`" 2.35 + cd "$CURDIR" 2.36 + if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then 2.37 + as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5 2.38 + fi 2.39 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5 2.40 +$as_echo_n "checking if nashorn should be overridden... " >&6; } 2.41 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5 2.42 +$as_echo "yes with $NASHORN_TOPDIR" >&6; } 2.43 +fi 2.44 if test "x$with_override_jdk" != x; then 2.45 CURDIR="$PWD" 2.46 cd "$with_override_jdk" 2.47 @@ -18534,14 +18550,18 @@ 2.48 2.49 ### Locate C compiler (CC) 2.50 2.51 -# gcc is almost always present, but on Windows we 2.52 -# prefer cl.exe and on Solaris we prefer CC. 2.53 -# Thus test for them in this order. 2.54 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 2.55 - # Do not probe for cc on MacOSX. 2.56 - COMPILER_CHECK_LIST="cl gcc" 2.57 -else 2.58 - COMPILER_CHECK_LIST="cl cc gcc" 2.59 +# On windows, only cl.exe is supported. 2.60 +# On Solaris, cc is preferred to gcc. 2.61 +# Elsewhere, gcc is preferred to cc. 2.62 + 2.63 +if test "x$CC" != x; then 2.64 + COMPILER_CHECK_LIST="$CC" 2.65 +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then 2.66 + COMPILER_CHECK_LIST="cl" 2.67 +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 2.68 + COMPILER_CHECK_LIST="cc gcc" 2.69 +else 2.70 + COMPILER_CHECK_LIST="gcc cc" 2.71 fi 2.72 2.73 2.74 @@ -19505,7 +19525,7 @@ 2.75 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 2.76 2.77 2.78 -# Now that we have resolved CC ourself, let autoconf have it's go at it 2.79 +# Now that we have resolved CC ourself, let autoconf have its go at it 2.80 ac_ext=c 2.81 ac_cpp='$CPP $CPPFLAGS' 2.82 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 2.83 @@ -20107,12 +20127,16 @@ 2.84 2.85 ### Locate C++ compiler (CXX) 2.86 2.87 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 2.88 - # Do not probe for CC on MacOSX. 2.89 - COMPILER_CHECK_LIST="cl g++" 2.90 -else 2.91 - COMPILER_CHECK_LIST="cl CC g++" 2.92 -fi 2.93 +if test "x$CXX" != x; then 2.94 + COMPILER_CHECK_LIST="$CXX" 2.95 +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then 2.96 + COMPILER_CHECK_LIST="cl" 2.97 +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 2.98 + COMPILER_CHECK_LIST="CC g++" 2.99 +else 2.100 + COMPILER_CHECK_LIST="g++ CC" 2.101 +fi 2.102 + 2.103 2.104 COMPILER_NAME=C++ 2.105 2.106 @@ -21074,7 +21098,7 @@ 2.107 $as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;} 2.108 2.109 2.110 -# Now that we have resolved CXX ourself, let autoconf have it's go at it 2.111 +# Now that we have resolved CXX ourself, let autoconf have its go at it 2.112 ac_ext=cpp 2.113 ac_cpp='$CXXCPP $CPPFLAGS' 2.114 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3.1 --- a/common/autoconf/source-dirs.m4 Tue Mar 12 22:08:13 2013 -0700 3.2 +++ b/common/autoconf/source-dirs.m4 Wed Mar 13 23:21:35 2013 -0700 3.3 @@ -33,12 +33,14 @@ 3.4 JAXP_TOPDIR="$SRC_ROOT/jaxp" 3.5 JAXWS_TOPDIR="$SRC_ROOT/jaxws" 3.6 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" 3.7 +NASHORN_TOPDIR="$SRC_ROOT/nashorn" 3.8 JDK_TOPDIR="$SRC_ROOT/jdk" 3.9 AC_SUBST(LANGTOOLS_TOPDIR) 3.10 AC_SUBST(CORBA_TOPDIR) 3.11 AC_SUBST(JAXP_TOPDIR) 3.12 AC_SUBST(JAXWS_TOPDIR) 3.13 AC_SUBST(HOTSPOT_TOPDIR) 3.14 +AC_SUBST(NASHORN_TOPDIR) 3.15 AC_SUBST(JDK_TOPDIR) 3.16 ]) 3.17 3.18 @@ -233,7 +235,18 @@ 3.19 fi 3.20 AC_MSG_CHECKING([if hotspot should be overridden]) 3.21 AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR]) 3.22 -fi 3.23 +fi 3.24 +if test "x$with_override_nashorn" != x; then 3.25 + CURDIR="$PWD" 3.26 + cd "$with_override_nashorn" 3.27 + NASHORN_TOPDIR="`pwd`" 3.28 + cd "$CURDIR" 3.29 + if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then 3.30 + AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!]) 3.31 + fi 3.32 + AC_MSG_CHECKING([if nashorn should be overridden]) 3.33 + AC_MSG_RESULT([yes with $NASHORN_TOPDIR]) 3.34 +fi 3.35 if test "x$with_override_jdk" != x; then 3.36 CURDIR="$PWD" 3.37 cd "$with_override_jdk"
4.1 --- a/common/autoconf/spec.gmk.in Tue Mar 12 22:08:13 2013 -0700 4.2 +++ b/common/autoconf/spec.gmk.in Wed Mar 13 23:21:35 2013 -0700 4.3 @@ -141,6 +141,7 @@ 4.4 JAXP_TOPDIR:=@JAXP_TOPDIR@ 4.5 JAXWS_TOPDIR:=@JAXWS_TOPDIR@ 4.6 HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@ 4.7 +NASHORN_TOPDIR:=@NASHORN_TOPDIR@ 4.8 COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@ 4.9 4.10 # Location where build customization files may be found 4.11 @@ -230,6 +231,7 @@ 4.12 JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws 4.13 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot 4.14 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk 4.15 +NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn 4.16 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images 4.17 JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release 4.18 4.19 @@ -238,6 +240,7 @@ 4.20 JAXP_DIST=$(JAXP_OUTPUTDIR)/dist 4.21 JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist 4.22 HOTSPOT_DIST=@HOTSPOT_DIST@ 4.23 +NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist 4.24 4.25 BUILD_HOTSPOT=@BUILD_HOTSPOT@ 4.26
5.1 --- a/common/autoconf/toolchain.m4 Tue Mar 12 22:08:13 2013 -0700 5.2 +++ b/common/autoconf/toolchain.m4 Wed Mar 13 23:21:35 2013 -0700 5.3 @@ -249,30 +249,38 @@ 5.4 5.5 ### Locate C compiler (CC) 5.6 5.7 -# gcc is almost always present, but on Windows we 5.8 -# prefer cl.exe and on Solaris we prefer CC. 5.9 -# Thus test for them in this order. 5.10 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 5.11 - # Do not probe for cc on MacOSX. 5.12 - COMPILER_CHECK_LIST="cl gcc" 5.13 +# On windows, only cl.exe is supported. 5.14 +# On Solaris, cc is preferred to gcc. 5.15 +# Elsewhere, gcc is preferred to cc. 5.16 + 5.17 +if test "x$CC" != x; then 5.18 + COMPILER_CHECK_LIST="$CC" 5.19 +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then 5.20 + COMPILER_CHECK_LIST="cl" 5.21 +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 5.22 + COMPILER_CHECK_LIST="cc gcc" 5.23 else 5.24 - COMPILER_CHECK_LIST="cl cc gcc" 5.25 + COMPILER_CHECK_LIST="gcc cc" 5.26 fi 5.27 5.28 TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST]) 5.29 -# Now that we have resolved CC ourself, let autoconf have it's go at it 5.30 +# Now that we have resolved CC ourself, let autoconf have its go at it 5.31 AC_PROG_CC([$CC]) 5.32 5.33 ### Locate C++ compiler (CXX) 5.34 5.35 -if test "x$OPENJDK_TARGET_OS" = xmacosx; then 5.36 - # Do not probe for CC on MacOSX. 5.37 - COMPILER_CHECK_LIST="cl g++" 5.38 +if test "x$CXX" != x; then 5.39 + COMPILER_CHECK_LIST="$CXX" 5.40 +elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then 5.41 + COMPILER_CHECK_LIST="cl" 5.42 +elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then 5.43 + COMPILER_CHECK_LIST="CC g++" 5.44 else 5.45 - COMPILER_CHECK_LIST="cl CC g++" 5.46 + COMPILER_CHECK_LIST="g++ CC" 5.47 fi 5.48 + 5.49 TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST]) 5.50 -# Now that we have resolved CXX ourself, let autoconf have it's go at it 5.51 +# Now that we have resolved CXX ourself, let autoconf have its go at it 5.52 AC_PROG_CXX([$CXX]) 5.53 5.54 ### Locate other tools
6.1 --- a/common/bin/hgforest.sh Tue Mar 12 22:08:13 2013 -0700 6.2 +++ b/common/bin/hgforest.sh Wed Mar 13 23:21:35 2013 -0700 6.3 @@ -96,7 +96,7 @@ 6.4 repos="" 6.5 repos_extra="" 6.6 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 6.7 - subrepos="corba jaxp jaxws langtools jdk hotspot" 6.8 + subrepos="corba jaxp jaxws langtools jdk hotspot nashorn" 6.9 if [ -f .hg/hgrc ] ; then 6.10 pull_default=`hg paths default` 6.11 if [ "${pull_default}" = "" ] ; then
7.1 --- a/common/makefiles/Main.gmk Tue Mar 12 22:08:13 2013 -0700 7.2 +++ b/common/makefiles/Main.gmk Wed Mar 13 23:21:35 2013 -0700 7.3 @@ -120,6 +120,12 @@ 7.4 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET)) 7.5 @$(call TargetExit) 7.6 7.7 +nashorn: jdk nashorn-only 7.8 +nashorn-only: start-make 7.9 + @$(call TargetEnter) 7.10 + @($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk) 7.11 + @$(call TargetExit) 7.12 + 7.13 demos: jdk demos-only 7.14 demos-only: start-make 7.15 @$(call TargetEnter) 7.16 @@ -128,7 +134,7 @@ 7.17 7.18 # Note: This double-colon rule is intentional, to support 7.19 # custom make file integration. 7.20 -images:: source-tips demos images-only 7.21 +images:: source-tips demos nashorn images-only 7.22 images-only: start-make 7.23 @$(call TargetEnter) 7.24 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images) 7.25 @@ -175,9 +181,10 @@ 7.26 @$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image 7.27 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images) 7.28 7.29 -test: start-make 7.30 +test: images test-only 7.31 +test-only: start-make 7.32 @$(call TargetEnter) 7.33 - @($(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 7.34 + @($(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 7.35 @$(call TargetExit) 7.36 7.37 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be 7.38 @@ -190,7 +197,7 @@ 7.39 7.40 7.41 # Remove everything, except the output from configure. 7.42 -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs 7.43 +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 7.44 @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*) 7.45 @$(ECHO) Cleaned all build artifacts. 7.46 7.47 @@ -220,6 +227,8 @@ 7.48 $(call CleanComponent,hotspot) 7.49 clean-jdk: 7.50 $(call CleanComponent,jdk) 7.51 +clean-nashorn: 7.52 + $(call CleanComponent,nashorn) 7.53 clean-images: 7.54 $(call CleanComponent,images) 7.55 clean-overlay-images: 7.56 @@ -230,10 +239,10 @@ 7.57 $(call CleanComponent,docs) 7.58 $(call CleanComponent,docstemp) 7.59 7.60 -.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install 7.61 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only 7.62 +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install 7.63 +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only 7.64 .PHONY: all test clean dist-clean bootcycle-images start-make 7.65 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build 7.66 +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build 7.67 .PHONY: profiles profiles-only profiles-oscheck 7.68 7.69 FRC: # Force target
8.1 --- a/common/makefiles/MakeBase.gmk Tue Mar 12 22:08:13 2013 -0700 8.2 +++ b/common/makefiles/MakeBase.gmk Wed Mar 13 23:21:35 2013 -0700 8.3 @@ -51,8 +51,9 @@ 8.4 -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \ 8.5 -e 's|X00|X|g' | tr '\n' '$2' 8.6 8.7 +# Subst in an extra $ to prevent it from disappearing. 8.8 define ListPathsSafely_If 8.9 - $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1))))) 8.10 + $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1)))))) 8.11 endef 8.12 8.13 define ListPathsSafely_Printf
9.1 --- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk Tue Mar 12 22:08:13 2013 -0700 9.2 +++ b/common/makefiles/javadoc/NON_CORE_PKGS.gmk Wed Mar 13 23:21:35 2013 -0700 9.3 @@ -80,7 +80,8 @@ 9.4 9.5 TREEAPI_PKGS = com.sun.source.doctree \ 9.6 com.sun.source.tree \ 9.7 - com.sun.source.util 9.8 + com.sun.source.util \ 9.9 + jdk 9.10 9.11 SMARTCARDIO_PKGS = javax.smartcardio 9.12 9.13 @@ -93,6 +94,8 @@ 9.14 com.apple.eio 9.15 endif 9.16 9.17 +JDK_PKGS = jdk 9.18 + 9.19 # non-core packages in rt.jar 9.20 NON_CORE_PKGS = $(DOMAPI_PKGS) \ 9.21 $(MGMT_PKGS) \ 9.22 @@ -103,5 +106,5 @@ 9.23 $(HTTPSERVER_PKGS) \ 9.24 $(SMARTCARDIO_PKGS) \ 9.25 $(SCTPAPI_PKGS) \ 9.26 - $(APPLE_EXT_PKGS) 9.27 - 9.28 + $(APPLE_EXT_PKGS) \ 9.29 + $(JDK_PKGS)
10.1 --- a/make/Defs-internal.gmk Tue Mar 12 22:08:13 2013 -0700 10.2 +++ b/make/Defs-internal.gmk Wed Mar 13 23:21:35 2013 -0700 10.3 @@ -100,6 +100,7 @@ 10.4 ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)") 10.5 ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)") 10.6 ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)") 10.7 +ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)") 10.8 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)") 10.9 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)") 10.10 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)") 10.11 @@ -165,6 +166,15 @@ 10.12 endif 10.13 endif 10.14 10.15 +NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile) 10.16 +ifndef BUILD_NASHORN 10.17 + ifdef ALT_NASHORN_DIST 10.18 + BUILD_NASHORN := false 10.19 + else 10.20 + BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE) 10.21 + endif 10.22 +endif 10.23 + 10.24 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile) 10.25 ifndef BUILD_DEPLOY 10.26 BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE) 10.27 @@ -308,6 +318,10 @@ 10.28 JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws 10.29 ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist 10.30 endif 10.31 +ifndef ALT_NASHORN_DIST 10.32 + NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn 10.33 + ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist 10.34 +endif 10.35 10.36 # Common make arguments (supplied to all component builds) 10.37 COMMON_BUILD_ARGUMENTS = \
11.1 --- a/make/jdk-rules.gmk Tue Mar 12 22:08:13 2013 -0700 11.2 +++ b/make/jdk-rules.gmk Wed Mar 13 23:21:35 2013 -0700 11.3 @@ -62,6 +62,9 @@ 11.4 ifeq ($(BUILD_JAXWS), true) 11.5 JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST) 11.6 endif 11.7 +ifeq ($(BUILD_NASHORN), true) 11.8 + JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST) 11.9 +endif 11.10 11.11 ifeq ($(BUILD_HOTSPOT), true) 11.12 JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/make/nashorn-rules.gmk Wed Mar 13 23:21:35 2013 -0700 12.3 @@ -0,0 +1,59 @@ 12.4 +# 12.5 +# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. 12.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.7 +# 12.8 +# This code is free software; you can redistribute it and/or modify it 12.9 +# under the terms of the GNU General Public License version 2 only, as 12.10 +# published by the Free Software Foundation. Oracle designates this 12.11 +# particular file as subject to the "Classpath" exception as provided 12.12 +# by Oracle in the LICENSE file that accompanied this code. 12.13 +# 12.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 12.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 12.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 12.17 +# version 2 for more details (a copy is included in the LICENSE file that 12.18 +# accompanied this code). 12.19 +# 12.20 +# You should have received a copy of the GNU General Public License version 12.21 +# 2 along with this work; if not, write to the Free Software Foundation, 12.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 12.23 +# 12.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 12.25 +# or visit www.oracle.com if you need additional information or have any 12.26 +# questions. 12.27 +# 12.28 + 12.29 +################################################################ 12.30 +# NASHORN TARGETS 12.31 +################################################################ 12.32 + 12.33 +NASHORN_BUILD_ARGUMENTS = \ 12.34 + $(COMMON_BUILD_ARGUMENTS) \ 12.35 + ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \ 12.36 + ALT_BOOTDIR=$(BOOTDIR) \ 12.37 + ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH) 12.38 + 12.39 +ifeq ($(BUILD_LANGTOOLS), true) 12.40 + NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST) 12.41 +endif 12.42 + 12.43 +# Default targets 12.44 +NASHORN = nashorn-build 12.45 + 12.46 +nashorn: nashorn-build 12.47 +nashorn-build: 12.48 + $(MKDIR) -p $(NASHORN_OUTPUTDIR) 12.49 + @$(call MakeStart,nashorn,all) 12.50 + ($(CD) $(NASHORN_TOPDIR)/make && \ 12.51 + $(MAKE) $(NASHORN_BUILD_ARGUMENTS) all) 12.52 + @$(call MakeFinish,nashorn,all) 12.53 + 12.54 +nashorn-clobber:: 12.55 + $(MKDIR) -p $(NASHORN_OUTPUTDIR) 12.56 + @$(call MakeStart,nashorn,clobber) 12.57 + ($(CD) $(NASHORN_TOPDIR)/make && \ 12.58 + $(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber) 12.59 + @$(call MakeFinish,nashorn,clobber) 12.60 + 12.61 +.PHONY: nashorn nashorn-build nashorn-clobber 12.62 +
13.1 --- a/make/sanity-rules.gmk Tue Mar 12 22:08:13 2013 -0700 13.2 +++ b/make/sanity-rules.gmk Wed Mar 13 23:21:35 2013 -0700 13.3 @@ -182,6 +182,14 @@ 13.4 "" >> $(WARNING_FILE) 13.5 endif 13.6 endif 13.7 +ifeq ($(NASHORN_SRC_AVAILABLE), true) 13.8 + ifneq ($(BUILD_NASHORN), true) 13.9 + @$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \ 13.10 + " The nashorn files will be obtained from \n" \ 13.11 + " the location set in ALT_JDK_IMPORT_PATH. \n" \ 13.12 + "" >> $(WARNING_FILE) 13.13 + endif 13.14 +endif 13.15 ifeq ($(DEPLOY_SRC_AVAILABLE), true) 13.16 ifneq ($(BUILD_DEPLOY), true) 13.17 @$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \ 13.18 @@ -268,6 +276,9 @@ 13.19 ifeq ($(JDK_SRC_AVAILABLE), true) 13.20 @$(ECHO) " JDK_TOPDIR = $(JDK_TOPDIR)" >> $(MESSAGE_FILE) 13.21 endif 13.22 +ifeq ($(NASHORN_SRC_AVAILABLE), true) 13.23 + @$(ECHO) " NASHORN_TOPDIR = $(NASHORN_TOPDIR)" >> $(MESSAGE_FILE) 13.24 +endif 13.25 ifeq ($(DEPLOY_SRC_AVAILABLE), true) 13.26 @$(ECHO) " DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)" >> $(MESSAGE_FILE) 13.27 endif 13.28 @@ -303,6 +314,9 @@ 13.29 ifeq ($(JDK_SRC_AVAILABLE), true) 13.30 @$(ECHO) " BUILD_JDK = $(BUILD_JDK) " >> $(MESSAGE_FILE) 13.31 endif 13.32 +ifeq ($(NASHORN_SRC_AVAILABLE), true) 13.33 + @$(ECHO) " BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE) 13.34 +endif 13.35 ifeq ($(DEPLOY_SRC_AVAILABLE), true) 13.36 @$(ECHO) " BUILD_DEPLOY = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE) 13.37 endif
14.1 --- a/make/scripts/hgforest.sh Tue Mar 12 22:08:13 2013 -0700 14.2 +++ b/make/scripts/hgforest.sh Wed Mar 13 23:21:35 2013 -0700 14.3 @@ -40,7 +40,7 @@ 14.4 repos="" 14.5 repos_extra="" 14.6 if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then 14.7 - subrepos="corba jaxp jaxws langtools jdk hotspot" 14.8 + subrepos="corba jaxp jaxws langtools jdk hotspot nashorn" 14.9 if [ -f .hg/hgrc ] ; then 14.10 pull_default=`hg paths default` 14.11 if [ "${pull_default}" = "" ] ; then
15.1 --- a/make/scripts/webrev.ksh Tue Mar 12 22:08:13 2013 -0700 15.2 +++ b/make/scripts/webrev.ksh Wed Mar 13 23:21:35 2013 -0700 15.3 @@ -3023,7 +3023,7 @@ 15.4 cleanup='s|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|' 15.5 fi 15.6 if [[ -n $WGET ]]; then 15.7 - msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup"` 15.8 + msg=`$WGET --timeout=10 --tries=1 -q $url -O - | grep '<title>' | sed 's/<title>\(.*\)<\/title>/\1/' | sed "$cleanup" | html_quote` 15.9 fi 15.10 if [[ -z $msg ]]; then 15.11 msg="${id}"
