51 FLAGS := -g -source 8 -target 8 -bootclasspath "$(JDK_CLASSES)", \ |
51 FLAGS := -g -source 8 -target 8 -bootclasspath "$(JDK_CLASSES)", \ |
52 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
52 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
53 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
53 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
54 |
54 |
55 # Build nashorn into intermediate directory |
55 # Build nashorn into intermediate directory |
56 $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \ |
56 # Name the compilation setup the same as the module, as is done in the global |
|
57 # CompileJavaModules.gmk, to make dependency checking with other modules work |
|
58 # seamlessly. |
|
59 $(eval $(call SetupJavaCompilation,jdk.scripting.nashorn, \ |
57 SETUP := GENERATE_NEWBYTECODE_DEBUG, \ |
60 SETUP := GENERATE_NEWBYTECODE_DEBUG, \ |
58 SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \ |
61 SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \ |
59 EXCLUDE_FILES := META-INF/MANIFEST.MF, \ |
62 EXCLUDE_FILES := META-INF/MANIFEST.MF, \ |
60 COPY := .properties .js, \ |
63 COPY := .properties .js, \ |
61 BIN := $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes)) |
64 BIN := $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes)) |
69 SRC := $(NASGEN_SRC) $(ASM_SRC), \ |
72 SRC := $(NASGEN_SRC) $(ASM_SRC), \ |
70 BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \ |
73 BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \ |
71 ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes")) |
74 ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes")) |
72 |
75 |
73 # Nasgen needs nashorn classes |
76 # Nasgen needs nashorn classes |
74 $(BUILD_NASGEN): $(BUILD_NASHORN) |
77 $(BUILD_NASGEN): $(jdk.scripting.nashorn) |
75 |
78 |
76 NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn |
79 NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn |
77 NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run |
80 NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run |
78 |
81 |
79 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package |
82 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package |