comparison make/CompileJavaModulesNashorn.gmk @ 50897:7c40e39e38a1

8203945: Cleanup nashorn build Reviewed-by: tbell
author erikj
date Wed, 30 May 2018 10:23:45 -0700
parents make/BuildNashorn.gmk@1fd27535bc57
children ae67f5db7469
comparison
equal deleted inserted replaced
4:995a1b14a164 0:e3d38d2db571
1 # 1 #
2 # Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 # or visit www.oracle.com if you need additional information or have any 22 # or visit www.oracle.com if you need additional information or have any
23 # questions. 23 # questions.
24 # 24 #
25 25
26 # This must be the first rule
27 default: all
28
29 include $(SPEC)
30 include MakeBase.gmk
31 include JarArchive.gmk
32 include JavaCompilation.gmk
33 include SetupJavaCompilers.gmk
34 include TextFileProcessing.gmk
35 include Modules.gmk
36
37 JDK_CLASSES := $(call PathList, $(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \
38 java.base java.logging java.scripting jdk.dynalink)))
39
40 # Need to use source and target 8 for nasgen to work.
41 $(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
42 JVM := $(JAVA_JAVAC), \
43 JAVAC := $(NEW_JAVAC), \
44 FLAGS := -g -source 10 -target 10 --upgrade-module-path "$(JDK_OUTPUTDIR)/modules/" \
45 --system none --module-source-path $(call GetModuleSrcPath), \
46 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
47 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
48
49 # Build nashorn into intermediate directory
50 # Name the compilation setup the same as the module, as is done in the global
51 # CompileJavaModules.gmk, to make dependency checking with other modules work
52 # seamlessly.
53 $(eval $(call SetupJavaCompilation, jdk.scripting.nashorn, \
54 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
55 MODULE := jdk.scripting.nashorn, \
56 SRC := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
57 COPY := .properties .js, \
58 BIN := $(SUPPORT_OUTPUTDIR)/special_classes, \
59 CREATE_API_DIGEST := true, \
60 ))
61
62 # Declare dependencies between java compilations of different modules.
63 # Since the other modules are declared in different invocations of this file,
64 # use the macro to find the correct target file to depend on.
65 # Only the javac compilation actually depends on other modules so limit
66 # dependency declaration to that by using the *_COMPILE_TARGET variable.
67 $(jdk.scripting.nashorn_COMPILE_TARGET): $(foreach d, $(call FindDepsForModule, jdk.scripting.nashorn), \
68 $(call SetupJavaCompilationApiTarget, $d, \
69 $(if $($d_BIN), $($d_BIN), $(JDK_OUTPUTDIR)/modules/$d)))
70
71 NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src 26 NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
72 ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm 27 ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
73 28
74 # Build nasgen 29 # Build nasgen
75 $(eval $(call SetupJavaCompilation, BUILD_NASGEN, \ 30 $(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
76 SETUP := GENERATE_OLDBYTECODE, \ 31 SETUP := GENERATE_OLDBYTECODE, \
77 SRC := $(NASGEN_SRC) $(ASM_SRC), \ 32 SRC := $(NASGEN_SRC) $(ASM_SRC), \
78 BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes)) 33 BIN := $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes, \
34 ))
79 35
80 NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn 36 NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)
81 NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run 37 NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
82 38
83 NASGEN_OPTIONS := \ 39 NASGEN_OPTIONS := \
84 -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \ 40 -cp $(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
85 --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \ 41 --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/nasgen_classes \
86 --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \ 42 --add-exports java.base/jdk.internal.org.objectweb.asm=ALL-UNNAMED \
87 --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \ 43 --add-exports java.base/jdk.internal.org.objectweb.asm.util=ALL-UNNAMED \
88 # 44 #
89 45
90 # Copy classes to final classes dir and run nasgen to modify classes in jdk.nashorn.internal.objects package 46 # Run nasgen to modify classes in jdk.nashorn.internal.objects package
91 $(NASGEN_RUN_FILE): $(BUILD_NASGEN) $(jdk.scripting.nashorn) 47 $(NASGEN_RUN_FILE): $(BUILD_NASGEN) $($(MODULE))
92 $(ECHO) Running nasgen 48 $(ECHO) Running nasgen
93 $(MKDIR) -p $(@D)
94 $(RM) -rf $(@D)/jdk $(@D)/netscape
95 $(CP) -R -p $(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/* $(@D)/
96 $(JAVA_SMALL) $(NASGEN_OPTIONS) \ 49 $(JAVA_SMALL) $(NASGEN_OPTIONS) \
97 jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D) 50 jdk.nashorn.internal.tools.nasgen.Main $(@D) \
51 jdk.nashorn.internal.objects $(@D)
98 $(TOUCH) $@ 52 $(TOUCH) $@
99
100 # Version file needs to be processed with version numbers
101 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \
102 SOURCE_FILES := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
103 OUTPUT_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties, \
104 REPLACEMENTS := \
105 @@VERSION_STRING@@ => $(VERSION_STRING) ; \
106 @@VERSION_SHORT@@ => $(VERSION_SHORT) , \
107 ))
108
109 # Version processing needs to happen after nasgen run since nasgen run deletes it
110 $(BUILD_VERSION_FILE): $(NASGEN_RUN_FILE)
111
112 compile: $(NASGEN_RUN_FILE) $(BUILD_VERSION_FILE)
113 all: compile
114
115 .PHONY: compile all