1.1 --- a/makefiles/BuildNashorn.gmk Thu Feb 14 14:07:53 2013 +0100 1.2 +++ b/makefiles/BuildNashorn.gmk Thu Feb 14 11:32:49 2013 -0400 1.3 @@ -35,8 +35,6 @@ 1.4 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.5 1.6 JDK_CLASSES := $(JDK_OUTPUTDIR)/classes 1.7 -# TODO: Remove dependency? 1.8 -DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar 1.9 1.10 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar 1.11 NASHORN_VERSION := $(JDK_VERSION) 1.12 @@ -61,8 +59,7 @@ 1.13 SETUP:=COMPILER_SETUP,\ 1.14 SRC:=$(NASHORN_TOPDIR)/src,\ 1.15 COPY:=.properties .js,\ 1.16 - BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes,\ 1.17 - ADD_JAVAC_FLAGS:=-cp $(DYNALINK_JAR))) 1.18 + BIN:=$(NASHORN_OUTPUTDIR)/nashorn_classes)) 1.19 1.20 # Build nasgen 1.21 $(eval $(call SetupJavaCompilation,BUILD_NASGEN,\ 1.22 @@ -89,14 +86,6 @@ 1.23 done 1.24 $(TOUCH) $@ 1.25 1.26 -# Unpack dynalink.jar for inclusion in nashorn.jar 1.27 -$(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked: $(DYNALINK_JAR) 1.28 - $(ECHO) Unpacking dynalink.jar 1.29 - $(MKDIR) -p $(@D) 1.30 - $(RM) -rf $(@D)/org 1.31 - $(UNZIP) -q $(DYNALINK_JAR) -x "META-INF*" -d $(@D) 1.32 - $(TOUCH) $@ 1.33 - 1.34 # Version file needs to be processed with version numbers 1.35 VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties 1.36 # Needs to happen after nasgen run since nasgen run deletes it 1.37 @@ -114,7 +103,6 @@ 1.38 # Create nashorn.jar from the final classes dir 1.39 $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\ 1.40 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \ 1.41 - $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \ 1.42 $(VERSION_FILE),\ 1.43 SRCS:=$(NASHORN_OUTPUTDIR)/classes,\ 1.44 SUFFIXES:=.class .clazz .js .properties Factory,\