Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/makefiles/BuildNashorn.gmk	Wed Oct 02 13:26:56 2013 -0700
     1.2 +++ b/makefiles/BuildNashorn.gmk	Thu Oct 10 14:58:13 2013 +0200
     1.3 @@ -37,35 +37,35 @@
     1.4  NASHORN_FULL_VERSION := $(FULL_VERSION)
     1.5  
     1.6  ifdef MILESTONE
     1.7 -  ifeq ($(MILESTONE),internal)
     1.8 +  ifeq ($(MILESTONE), internal)
     1.9      NASHORN_VERSION = $(FULL_VERSION)
    1.10    endif
    1.11  endif
    1.12  
    1.13  # Need to use source and target 7 for nasgen to work.
    1.14 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
    1.15 -    JVM:=$(JAVA),\
    1.16 -    JAVAC:=$(NEW_JAVAC),\
    1.17 -    FLAGS:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),\
    1.18 -    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.19 -    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.20 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
    1.21 +    JVM := $(JAVA), \
    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:=GENERATE_NEWBYTECODE_DEBUG,\
    1.30 -    SRC:=$(NASHORN_TOPDIR)/src,\
    1.31 -    COPY:=.properties .js,\
    1.32 -    BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes))
    1.33 +$(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
    1.34 +    SETUP := GENERATE_NEWBYTECODE_DEBUG, \
    1.35 +    SRC := $(NASHORN_TOPDIR)/src, \
    1.36 +    COPY := .properties .js, \
    1.37 +    BIN := $(NASHORN_OUTPUTDIR)/nashorn_classes))
    1.38  
    1.39  NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
    1.40  ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
    1.41  
    1.42  # Build nasgen
    1.43 -$(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
    1.44 -    SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
    1.45 -    SRC:=$(NASGEN_SRC) $(ASM_SRC), \
    1.46 -    BIN:=$(NASHORN_OUTPUTDIR)/nasgen_classes,\
    1.47 -    ADD_JAVAC_FLAGS:=-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
    1.48 +$(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
    1.49 +    SETUP := GENERATE_NEWBYTECODE_DEBUG, \
    1.50 +    SRC := $(NASGEN_SRC) $(ASM_SRC), \
    1.51 +    BIN := $(NASHORN_OUTPUTDIR)/nasgen_classes, \
    1.52 +    ADD_JAVAC_FLAGS := -cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
    1.53  
    1.54  # Nasgen needs nashorn classes
    1.55  $(BUILD_NASGEN): $(BUILD_NASHORN)
    1.56 @@ -77,35 +77,36 @@
    1.57  	$(RM) -rf $(@D)/jdk $(@D)/netscape
    1.58  	$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
    1.59  	$(FIXPATH) $(JAVA) \
    1.60 -		-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
    1.61 -		jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
    1.62 +	    -cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
    1.63 +	    jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
    1.64  	$(TOUCH) $@
    1.65  
    1.66  # Version file needs to be processed with version numbers
    1.67  VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
    1.68 +
    1.69  # Needs to happen after nasgen run since nasgen run deletes it
    1.70  $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
    1.71  $(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
    1.72  	$(ECHO) Creating version.properties
    1.73  	$(MKDIR) -p $(@D)
    1.74  	$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \
    1.75 -		-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
    1.76 -		-e '/^#.*$$/d' -e '/^$$/d'  > $@
    1.77 +	    -e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
    1.78 +	    -e '/^#.*$$/d' -e '/^$$/d'  > $@
    1.79  
    1.80  
    1.81 -MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
    1.82 +MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
    1.83  
    1.84  # Create nashorn.jar from the final classes dir
    1.85 -$(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
    1.86 +$(eval $(call SetupArchive,BUILD_NASHORN_JAR, \
    1.87      $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
    1.88 -    $(VERSION_FILE),\
    1.89 -    SRCS:=$(NASHORN_OUTPUTDIR)/classes,\
    1.90 -    SUFFIXES:=.class .js .properties Factory,\
    1.91 -    MANIFEST:=$(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,\
    1.92 -    EXTRA_MANIFEST_ATTR:=$(MANIFEST_ATTRIBUTES),\
    1.93 -    SKIP_METAINF:=true,\
    1.94 -    JAR:=$(NASHORN_JAR)))
    1.95 +    $(VERSION_FILE), \
    1.96 +    SRCS := $(NASHORN_OUTPUTDIR)/classes, \
    1.97 +    SUFFIXES := .class .js .properties Factory, \
    1.98 +    MANIFEST := $(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF, \
    1.99 +    EXTRA_MANIFEST_ATTR := $(MANIFEST_ATTRIBUTES), \
   1.100 +    SKIP_METAINF := true, \
   1.101 +    JAR := $(NASHORN_JAR)))
   1.102  
   1.103  all: $(NASHORN_JAR)
   1.104 -    
   1.105 +
   1.106  .PHONY: all

     2.1 --- a/makefiles/Makefile	Wed Oct 02 13:26:56 2013 -0700
     2.2 +++ b/makefiles/Makefile	Thu Oct 10 14:58:13 2013 +0200
     2.3 @@ -24,19 +24,19 @@
     2.4  #
     2.5  
     2.6  # Locate this Makefile
     2.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
     2.8 -    makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
     2.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
    2.10 +  makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
    2.11  else
    2.12 -    makefile_path:=$(lastword $(MAKEFILE_LIST))
    2.13 +  makefile_path := $(lastword $(MAKEFILE_LIST))
    2.14  endif
    2.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path))
    2.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
    2.17  
    2.18  # What is the name of this subsystem (langtools, corba, etc)?
    2.19 -subsystem_name:=$(notdir $(repo_dir))
    2.20 +subsystem_name := $(notdir $(repo_dir))
    2.21  
    2.22  # Try to locate top-level makefile
    2.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile
    2.24 -ifneq ($(wildcard $(top_level_makefile)),)
    2.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile
    2.26 +ifneq ($(wildcard $(top_level_makefile)), )
    2.27    $(info Will run $(subsystem_name) target on top-level Makefile)
    2.28    $(info WARNING: This is a non-recommended way of building!)
    2.29    $(info ===================================================)