Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/makefiles/BuildNashorn.gmk	Fri Feb 22 22:39:23 2013 +0530
     1.2 +++ b/makefiles/BuildNashorn.gmk	Fri Feb 22 23:33:46 2013 -0400
     1.3 @@ -30,10 +30,6 @@
     1.4  include MakeBase.gmk
     1.5  include JavaCompilation.gmk
     1.6  
     1.7 -# TODO: build-infra, move this to SPEC
     1.8 -JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
     1.9 -		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
    1.10 -
    1.11  JDK_CLASSES := $(JDK_OUTPUTDIR)/classes
    1.12  
    1.13  NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar
    1.14 @@ -47,23 +43,23 @@
    1.15  endif
    1.16  
    1.17  # Need to use source and target 7 for nasgen to work.
    1.18 -$(eval $(call SetupJavaCompiler,COMPILER_SETUP,\
    1.19 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
    1.20      JVM:=$(JAVA),\
    1.21 -    JAVAC:=$(JAVAC_JARS),\
    1.22 +    JAVAC:=$(NEW_JAVAC),\
    1.23      FLAGS:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),\
    1.24      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.25      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.26  
    1.27  # Build nashorn into intermediate directory
    1.28  $(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
    1.29 -    SETUP:=COMPILER_SETUP,\
    1.30 +    SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
    1.31      SRC:=$(NASHORN_TOPDIR)/src,\
    1.32      COPY:=.properties .js,\
    1.33      BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
    1.34  
    1.35  # Build nasgen
    1.36  $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
    1.37 -    SETUP:=COMPILER_SETUP,\
    1.38 +    SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
    1.39      SRC:=$(NASHORN_TOPDIR)/buildtools/nasgen/src,\
    1.40      BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
    1.41      ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))