Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/Makefile	Thu Feb 21 17:39:58 2013 -0800
     1.2 +++ b/Makefile	Mon Feb 25 15:08:11 2013 -0800
     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	Thu Feb 21 17:39:58 2013 -0800
     2.2 +++ b/common/autoconf/generated-configure.sh	Mon Feb 25 15:08:11 2013 -0800
     2.3 @@ -747,6 +747,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 @@ -15663,6 +15664,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 @@ -15673,6 +15675,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 @@ -15903,6 +15906,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"

     3.1 --- a/common/autoconf/source-dirs.m4	Thu Feb 21 17:39:58 2013 -0800
     3.2 +++ b/common/autoconf/source-dirs.m4	Mon Feb 25 15:08:11 2013 -0800
     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	Thu Feb 21 17:39:58 2013 -0800
     4.2 +++ b/common/autoconf/spec.gmk.in	Mon Feb 25 15:08:11 2013 -0800
     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/bin/hgforest.sh	Thu Feb 21 17:39:58 2013 -0800
     5.2 +++ b/common/bin/hgforest.sh	Mon Feb 25 15:08:11 2013 -0800
     5.3 @@ -96,7 +96,7 @@
     5.4  repos=""
     5.5  repos_extra=""
     5.6  if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
     5.7 -  subrepos="corba jaxp jaxws langtools jdk hotspot"
     5.8 +  subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
     5.9    if [ -f .hg/hgrc ] ; then
    5.10      pull_default=`hg paths default`
    5.11      if [ "${pull_default}" = "" ] ; then

     6.1 --- a/common/makefiles/Main.gmk	Thu Feb 21 17:39:58 2013 -0800
     6.2 +++ b/common/makefiles/Main.gmk	Mon Feb 25 15:08:11 2013 -0800
     6.3 @@ -123,6 +123,12 @@
     6.4  	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
     6.5  	@$(call TargetExit)
     6.6  
     6.7 +nashorn: jdk nashorn-only
     6.8 +nashorn-only: start-make
     6.9 +	@$(call TargetEnter)
    6.10 +	@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
    6.11 +	@$(call TargetExit)
    6.12 +
    6.13  demos: jdk demos-only
    6.14  demos-only: start-make
    6.15  	@$(call TargetEnter)
    6.16 @@ -131,7 +137,7 @@
    6.17  
    6.18  # Note: This double-colon rule is intentional, to support
    6.19  # custom make file integration.
    6.20 -images:: source-tips demos images-only
    6.21 +images:: source-tips demos nashorn images-only
    6.22  images-only: start-make
    6.23  	@$(call TargetEnter)
    6.24  	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
    6.25 @@ -193,7 +199,7 @@
    6.26  
    6.27  
    6.28  # Remove everything, except the output from configure.
    6.29 -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
    6.30 +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
    6.31  	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
    6.32  	@$(ECHO) Cleaned all build artifacts.
    6.33  
    6.34 @@ -223,6 +229,8 @@
    6.35  	$(call CleanComponent,hotspot)
    6.36  clean-jdk:
    6.37  	$(call CleanComponent,jdk)
    6.38 +clean-nashorn:
    6.39 +	$(call CleanComponent,nashorn)
    6.40  clean-images:
    6.41  	$(call CleanComponent,images)
    6.42  clean-overlay-images:
    6.43 @@ -233,10 +241,10 @@
    6.44  	$(call CleanComponent,docs)
    6.45  	$(call CleanComponent,docstemp)
    6.46  
    6.47 -.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
    6.48 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
    6.49 +.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install
    6.50 +.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only
    6.51  .PHONY: all test clean dist-clean bootcycle-images start-make
    6.52 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
    6.53 +.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build
    6.54  .PHONY: profiles profiles-only profiles-oscheck
    6.55  
    6.56  FRC: # Force target

     7.1 --- a/common/makefiles/MakeBase.gmk	Thu Feb 21 17:39:58 2013 -0800
     7.2 +++ b/common/makefiles/MakeBase.gmk	Mon Feb 25 15:08:11 2013 -0800
     7.3 @@ -51,8 +51,9 @@
     7.4  		     -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
     7.5  		     -e 's|X00|X|g' | tr '\n' '$2'
     7.6  
     7.7 +# Subst in an extra $ to prevent it from disappearing.
     7.8  define ListPathsSafely_If
     7.9 -    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
    7.10 +    $(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(subst $$,$$$$,$(wordlist $3,$4,$($1))))))
    7.11  endef
    7.12  
    7.13  define ListPathsSafely_Printf

     8.1 --- a/make/Defs-internal.gmk	Thu Feb 21 17:39:58 2013 -0800
     8.2 +++ b/make/Defs-internal.gmk	Mon Feb 25 15:08:11 2013 -0800
     8.3 @@ -100,6 +100,7 @@
     8.4  ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
     8.5  ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
     8.6  ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
     8.7 +ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
     8.8  ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
     8.9  ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
    8.10  ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
    8.11 @@ -165,6 +166,15 @@
    8.12    endif
    8.13  endif
    8.14  
    8.15 +NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
    8.16 +ifndef BUILD_NASHORN
    8.17 +  ifdef ALT_NASHORN_DIST
    8.18 +    BUILD_NASHORN := false
    8.19 +  else
    8.20 +    BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
    8.21 +  endif
    8.22 +endif
    8.23 +
    8.24  DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
    8.25  ifndef BUILD_DEPLOY
    8.26    BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
    8.27 @@ -308,6 +318,10 @@
    8.28    JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
    8.29    ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
    8.30  endif
    8.31 +ifndef ALT_NASHORN_DIST
    8.32 +  NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
    8.33 +  ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
    8.34 +endif
    8.35  
    8.36  # Common make arguments (supplied to all component builds)
    8.37  COMMON_BUILD_ARGUMENTS = \

     9.1 --- a/make/jdk-rules.gmk	Thu Feb 21 17:39:58 2013 -0800
     9.2 +++ b/make/jdk-rules.gmk	Mon Feb 25 15:08:11 2013 -0800
     9.3 @@ -62,6 +62,9 @@
     9.4  ifeq ($(BUILD_JAXWS), true)
     9.5    JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
     9.6  endif
     9.7 +ifeq ($(BUILD_NASHORN), true)
     9.8 +  JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
     9.9 +endif
    9.10  
    9.11  ifeq ($(BUILD_HOTSPOT), true)
    9.12    JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import

    10.1 --- a/make/sanity-rules.gmk	Thu Feb 21 17:39:58 2013 -0800
    10.2 +++ b/make/sanity-rules.gmk	Mon Feb 25 15:08:11 2013 -0800
    10.3 @@ -182,6 +182,14 @@
    10.4  	   "" >> $(WARNING_FILE)
    10.5    endif
    10.6  endif
    10.7 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
    10.8 +  ifneq ($(BUILD_NASHORN), true)
    10.9 +	@$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
   10.10 +           "        The nashorn files will be obtained from \n" \
   10.11 +           "        the location set in ALT_JDK_IMPORT_PATH. \n" \
   10.12 +           "" >> $(WARNING_FILE)
   10.13 +  endif
   10.14 +endif
   10.15  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
   10.16    ifneq ($(BUILD_DEPLOY), true)
   10.17  	@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
   10.18 @@ -268,6 +276,9 @@
   10.19  ifeq ($(JDK_SRC_AVAILABLE), true)
   10.20  	@$(ECHO) "   JDK_TOPDIR = $(JDK_TOPDIR)"  >> $(MESSAGE_FILE)
   10.21  endif
   10.22 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
   10.23 +	@$(ECHO) "   NASHORN_TOPDIR = $(NASHORN_TOPDIR)"  >> $(MESSAGE_FILE)
   10.24 +endif
   10.25  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
   10.26  	@$(ECHO) "   DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)"  >> $(MESSAGE_FILE)
   10.27  endif
   10.28 @@ -303,6 +314,9 @@
   10.29  ifeq ($(JDK_SRC_AVAILABLE), true)
   10.30  	@$(ECHO) "   BUILD_JDK    = $(BUILD_JDK) " >> $(MESSAGE_FILE)
   10.31  endif
   10.32 +ifeq ($(NASHORN_SRC_AVAILABLE), true)
   10.33 +	@$(ECHO) "   BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
   10.34 +endif
   10.35  ifeq ($(DEPLOY_SRC_AVAILABLE), true)
   10.36  	@$(ECHO) "   BUILD_DEPLOY  = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
   10.37  endif

    11.1 --- a/make/scripts/hgforest.sh	Thu Feb 21 17:39:58 2013 -0800
    11.2 +++ b/make/scripts/hgforest.sh	Mon Feb 25 15:08:11 2013 -0800
    11.3 @@ -40,7 +40,7 @@
    11.4  repos=""
    11.5  repos_extra=""
    11.6  if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then
    11.7 -  subrepos="corba jaxp jaxws langtools jdk hotspot"
    11.8 +  subrepos="corba jaxp jaxws langtools jdk hotspot nashorn"
    11.9    if [ -f .hg/hgrc ] ; then
   11.10      pull_default=`hg paths default`
   11.11      if [ "${pull_default}" = "" ] ; then