8008420: Fix Nashorn forest to build with NEWBUILD=false

Mon, 18 Feb 2013 19:01:59 -0400

author
jlaskey
date
Mon, 18 Feb 2013 19:01:59 -0400
changeset 880
8b19b55f695d
parent 879
9ed388a04fa7
child 881
f9a1cb245484

8008420: Fix Nashorn forest to build with NEWBUILD=false
Reviewed-by: jjh
Contributed-by: james.laskey@oracle.com

Makefile file | annotate | diff | comparison | revisions
make/nashorn-rules.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/Makefile	Wed Feb 06 13:37:03 2013 -0400
     1.2 +++ b/Makefile	Mon Feb 18 19:01:59 2013 -0400
     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/make/nashorn-rules.gmk	Wed Feb 06 13:37:03 2013 -0400
     2.2 +++ b/make/nashorn-rules.gmk	Mon Feb 18 19:01:59 2013 -0400
     2.3 @@ -37,6 +37,9 @@
     2.4     NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
     2.5  endif
     2.6  
     2.7 +# Default targets
     2.8 +NASHORN = nashorn-build
     2.9 +
    2.10  nashorn: nashorn-build
    2.11  nashorn-build:
    2.12  	$(MKDIR) -p $(NASHORN_OUTPUTDIR)

mercurial