48 JAVAC := $(NEW_JAVAC), \
49 FLAGS := -g -source 7 -target 7 -bootclasspath $(JDK_CLASSES), \
50 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
51 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
52
53 # Build nashorn into intermediate directory
54 $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
55 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
56 SRC := $(NASHORN_TOPDIR)/src, \
57 COPY := .properties .js, \
58 BIN := $(NASHORN_OUTPUTDIR)/nashorn_classes))
59
60 NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
61 ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
62
63 # Build nasgen
64 $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
65 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
66 SRC := $(NASGEN_SRC) $(ASM_SRC), \
67 BIN := $(NASHORN_OUTPUTDIR)/nasgen_classes, \
68 ADD_JAVAC_FLAGS := -cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
69
70 # Nasgen needs nashorn classes
71 $(BUILD_NASGEN): $(BUILD_NASHORN)
72
73 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
74 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
75 $(ECHO) Running nasgen
76 $(MKDIR) -p $(@D)
77 $(RM) -rf $(@D)/jdk $(@D)/netscape
78 $(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
79 $(FIXPATH) $(JAVA) \
80 -Xbootclasspath/p:"$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
81 jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
82 $(TOUCH) $@
83
84 # Version file needs to be processed with version numbers
85 VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
86
87 # Needs to happen after nasgen run since nasgen run deletes it
88 $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
|
48 JAVAC := $(NEW_JAVAC), \
49 FLAGS := -g -source 7 -target 7 -bootclasspath $(JDK_CLASSES), \
50 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
51 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
52
53 # Build nashorn into intermediate directory
54 $(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
55 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
56 SRC := $(NASHORN_TOPDIR)/src, \
57 COPY := .properties .js, \
58 BIN := $(NASHORN_OUTPUTDIR)/nashorn_classes))
59
60 NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
61 ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
62
63 # Build nasgen
64 $(eval $(call SetupJavaCompilation,BUILD_NASGEN, \
65 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
66 SRC := $(NASGEN_SRC) $(ASM_SRC), \
67 BIN := $(NASHORN_OUTPUTDIR)/nasgen_classes, \
68 ADD_JAVAC_FLAGS := -bootclasspath "$(BOOT_RTJAR)$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes"))
69
70 # Nasgen needs nashorn classes
71 $(BUILD_NASGEN): $(BUILD_NASHORN)
72
73 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package
74 $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
75 $(ECHO) Running nasgen
76 $(MKDIR) -p $(@D)
77 $(RM) -rf $(@D)/jdk $(@D)/netscape
78 $(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
79 $(FIXPATH) $(JAVA) \
80 -Xbootclasspath/p:"$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
81 jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
82 $(TOUCH) $@
83
84 # Version file needs to be processed with version numbers
85 VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
86
87 # Needs to happen after nasgen run since nasgen run deletes it
88 $(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
|