stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8141333: Rename SetupArchive to SetupJarArchive

Browse Source 
Reviewed-by: erikj, tbell
This commit is contained in:
Magnus Ihse Bursie 2015-11-03 17:54:19 +01:00
parent 5532631558
commit 79287d45cf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nashorn/make/BuildNashorn.gmk
View File

@ -28,6 +28,7 @@ default: all
-include $(SPEC) -include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include JarArchive.gmk
include JavaCompilation.gmk include JavaCompilation.gmk
include SetupJavaCompilers.gmk include SetupJavaCompilers.gmk
@ -108,7 +109,7 @@ $(VERSION_FILE): $(VERSION_SRC)
MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION) MANIFEST_ATTRIBUTES := Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
# Create nashorn.jar from the final classes dir # Create nashorn.jar from the final classes dir
$(eval $(call SetupArchive,BUILD_NASHORN_JAR, \ $(eval $(call SetupJarArchive, BUILD_NASHORN_JAR, \
DEPENDENCIES := $(NASGEN_RUN_FILE) \ DEPENDENCIES := $(NASGEN_RUN_FILE) \
$(VERSION_FILE), \ $(VERSION_FILE), \
SRCS := $(NASHORN_CLASSES_DIR), \ SRCS := $(NASHORN_CLASSES_DIR), \
@ -116,7 +117,8 @@ $(eval $(call SetupArchive,BUILD_NASHORN_JAR, \
MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \ MANIFEST := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/META-INF/MANIFEST.MF, \
EXTRA_MANIFEST_ATTR := $(MANIFEST_ATTRIBUTES), \ EXTRA_MANIFEST_ATTR := $(MANIFEST_ATTRIBUTES), \
SKIP_METAINF := true, \ SKIP_METAINF := true, \
JAR := $(NASHORN_JAR))) JAR := $(NASHORN_JAR), \
))
compile: $(NASHORN_RUN_FILE) $(VERSION_FILE) compile: $(NASHORN_RUN_FILE) $(VERSION_FILE)
all: $(NASHORN_JAR) all: $(NASHORN_JAR)