Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 1337:4c0edd9f9342
8081814: Modularize the deploy build
Reviewed-by: ihse, ddehaven
| author | erikj |
|---|---|
| date | Wed, 27 May 2015 17:35:21 +0200 |
| parents | 87f7ef8273bc |
| children | 0fddb652c2bb |
| files | make/BuildNashorn.gmk |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/BuildNashorn.gmk Tue Jun 16 18:26:25 2015 +0530 +++ b/make/BuildNashorn.gmk Wed May 27 17:35:21 2015 +0200 @@ -58,7 +58,7 @@ SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \ EXCLUDE_FILES := META-INF/MANIFEST.MF, \ COPY := .properties .js, \ - BIN := $(SUPPORT_OUTPUTDIR)/misc/jdk.scripting.nashorn/classes)) + BIN := $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes)) NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm @@ -68,7 +68,7 @@ SETUP := GENERATE_OLDBYTECODE, \ SRC := $(NASGEN_SRC) $(ASM_SRC), \ BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \ - ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/misc/jdk.scripting.nashorn/classes")) + ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes")) # Nasgen needs nashorn classes $(BUILD_NASGEN): $(BUILD_NASHORN) @@ -81,9 +81,9 @@ $(ECHO) Running nasgen $(MKDIR) -p $(@D) $(RM) -rf $(@D)/jdk $(@D)/netscape - $(CP) -R -p $(SUPPORT_OUTPUTDIR)/misc/jdk.scripting.nashorn/classes/* $(@D)/ + $(CP) -R -p $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes/* $(@D)/ $(FIXPATH) $(JAVA) \ - -Xbootclasspath/p:"$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(SUPPORT_OUTPUTDIR)/misc/jdk.scripting.nashorn/classes" \ + -Xbootclasspath/p:"$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes" \ jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D) $(TOUCH) $@