archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-24 04:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8081814: Modularize the deploy build

Browse source 
Reviewed-by: ihse, ddehaven
This commit is contained in:
Erik Joelsson 2015-05-27 17:35:21 +02:00
parent 2ea5c82229
commit c318ab6e23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nashorn/make/BuildNashorn.gmk
View file

@ -58,7 +58,7 @@ $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \ SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
EXCLUDE_FILES := META-INF/MANIFEST.MF, \ EXCLUDE_FILES := META-INF/MANIFEST.MF, \
COPY := .properties .js, \ 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 NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
@ -68,7 +68,7 @@ $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
SETUP := GENERATE_OLDBYTECODE, \ SETUP := GENERATE_OLDBYTECODE, \
SRC := $(NASGEN_SRC) $(ASM_SRC), \ SRC := $(NASGEN_SRC) $(ASM_SRC), \
BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \ 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 # Nasgen needs nashorn classes
$(BUILD_NASGEN): $(BUILD_NASHORN) $(BUILD_NASGEN): $(BUILD_NASHORN)
@ -81,9 +81,9 @@ $(NASGEN_RUN_FILE): $(BUILD_NASGEN)
$(ECHO) Running nasgen $(ECHO) Running nasgen
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
$(RM) -rf $(@D)/jdk $(@D)/netscape $(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) \ $(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) jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
$(TOUCH) $@ $(TOUCH) $@