37 JDK_CLASSES := $(JDK_OUTPUTDIR)/classes |
37 JDK_CLASSES := $(JDK_OUTPUTDIR)/classes |
38 # TODO: Remove dependency? |
38 # TODO: Remove dependency? |
39 DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar |
39 DYNALINK_JAR := $(NASHORN_TOPDIR)/build/dynalink/dynalink.jar |
40 |
40 |
41 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar |
41 NASHORN_JAR := $(NASHORN_DIST)/nashorn.jar |
42 NASHORN_VERSION := 0.1 |
42 NASHORN_VERSION := $(JDK_VERSION) |
|
43 NASHORN_FULL_VERSION := $(FULL_VERSION) |
|
44 |
|
45 ifdef MILESTONE |
|
46 ifeq ($(MILESTONE),internal) |
|
47 NASHORN_VERSION = $(FULL_VERSION) |
|
48 endif |
|
49 endif |
43 |
50 |
44 # Need to use source and target 7 for nasgen to work. |
51 # Need to use source and target 7 for nasgen to work. |
45 $(eval $(call SetupJavaCompiler,COMPILER_SETUP,\ |
52 $(eval $(call SetupJavaCompiler,COMPILER_SETUP,\ |
46 JVM:=$(JAVA),\ |
53 JVM:=$(JAVA),\ |
47 JAVAC:=$(JAVAC_JARS),\ |
54 JAVAC:=$(JAVAC_JARS),\ |
95 # Needs to happen after nasgen run since nasgen run deletes it |
102 # Needs to happen after nasgen run since nasgen run deletes it |
96 $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run |
103 $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run |
97 $(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template |
104 $(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template |
98 $(ECHO) Creating version.properties |
105 $(ECHO) Creating version.properties |
99 $(MKDIR) -p $(@D) |
106 $(MKDIR) -p $(@D) |
100 $(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_VERSION)/g' \ |
107 $(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \ |
101 -e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \ |
108 -e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \ |
102 -e '/^#.*$$/d' -e '/^$$/d' > $@ |
109 -e '/^#.*$$/d' -e '/^$$/d' > $@ |
103 |
110 |
104 |
111 |
105 MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_VERSION) |
112 MANIFEST_ATTRIBUTES:=Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION) |
106 |
113 |
107 # Create nashorn.jar from the final classes dir |
114 # Create nashorn.jar from the final classes dir |
108 $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\ |
115 $(eval $(call SetupArchive,BUILD_NASHORN_JAR,\ |
109 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \ |
116 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \ |
110 $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \ |
117 $(NASHORN_OUTPUTDIR)/classes/_the.dynalink.unpacked \ |