30 include MakeBase.gmk |
30 include MakeBase.gmk |
31 include JavaCompilation.gmk |
31 include JavaCompilation.gmk |
32 |
32 |
33 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools |
33 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools |
34 # and the bootstrap javac, to be run by the bootdir jvm. |
34 # and the bootstrap javac, to be run by the bootdir jvm. |
35 $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\ |
35 $(eval $(call SetupJavaCompiler,BOOT_JAVAC, \ |
36 JAVAC:=$(JAVAC),\ |
36 JAVAC := $(JAVAC), \ |
37 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
37 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
38 SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\ |
38 SERVER_JVM := $(SJAVAC_SERVER_JAVA), \ |
39 FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) |
39 FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror)) |
40 |
40 |
41 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. |
41 # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied. |
42 RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool |
42 RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool |
43 |
43 |
44 # Now setup the compilation of the properties compilation tool. You can depend |
44 # Now setup the compilation of the properties compilation tool. You can depend |
45 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we |
45 # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we |
46 # add src/share/classes to the sourcepath. This is necessary since the GenStubs |
46 # add src/share/classes to the sourcepath. This is necessary since the GenStubs |
47 # program needs to be linked and run towards the new javac sources. |
47 # program needs to be linked and run towards the new javac sources. |
48 $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\ |
48 $(eval $(call SetupJavaCompilation,BUILD_TOOLS, \ |
49 SETUP:=BOOT_JAVAC,\ |
49 SETUP := BOOT_JAVAC, \ |
50 DISABLE_SJAVAC:=true,\ |
50 DISABLE_SJAVAC := true, \ |
51 ADD_JAVAC_FLAGS:=-Xprefer:source,\ |
51 ADD_JAVAC_FLAGS := -Xprefer:source, \ |
52 SRC:=$(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes,\ |
52 SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \ |
53 INCLUDES:=compileproperties genstubs,\ |
53 INCLUDES := compileproperties genstubs, \ |
54 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses)) |
54 BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses)) |
55 |
55 |
56 # The compileprops tools compiles a properties file into a resource bundle. |
56 # The compileprops tools compiles a properties file into a resource bundle. |
57 TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet |
57 TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet |
|
58 |
58 # Lookup the properties that need to be compiled into resource bundles. |
59 # Lookup the properties that need to be compiled into resource bundles. |
59 PROPSOURCES:=$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") |
60 PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") |
|
61 |
60 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN" |
62 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN" |
61 PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES)) |
63 PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES)) |
|
64 |
62 # Generate the list of java files to be created. |
65 # Generate the list of java files to be created. |
63 PROPJAVAS:=$(patsubst %,$(LANGTOOLS_OUTPUTDIR)/gensrc/%.java,$(PROPPATHS)) |
66 PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS)) |
|
67 |
64 # Generate the package dirs for the tobe generated java files. |
68 # Generate the package dirs for the tobe generated java files. |
65 PROPDIRS:=$(dir $(PROPJAVAS)) |
69 PROPDIRS := $(dir $(PROPJAVAS)) |
|
70 |
66 # Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle" |
71 # Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle" |
67 # suitable to be fed into the CompileProperties command. |
72 # suitable to be fed into the CompileProperties command. |
68 PROPCMDLINE:=$(subst _SPACE_,$(SPACE),$(join $(addprefix -compile_SPACE_,$(PROPSOURCES)), \ |
73 PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \ |
69 $(addsuffix _SPACE_java.util.ListResourceBundle,$(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/,$(addsuffix .java,$(PROPPATHS)))))) |
74 $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS)))))) |
70 |
75 |
71 # Now setup the rule for the generation of the resource bundles. |
76 # Now setup the rule for the generation of the resource bundles. |
72 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS) |
77 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS) |
73 $(RM) -r $(@D)/* |
78 $(RM) -r $(@D)/* |
74 $(MKDIR) -p $(@D) $(PROPDIRS) |
79 $(MKDIR) -p $(@D) $(PROPDIRS) |
75 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties |
80 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties |
76 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties |
81 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties |
77 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties |
82 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties |
78 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties |
83 $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties |
79 $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles |
84 $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles |
80 $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ |
85 $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ |
81 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ |
86 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ |
82 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ |
87 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ |
83 java.util.ListResourceBundle \ |
88 java.util.ListResourceBundle \ |
84 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ |
89 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \ |
85 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ |
90 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \ |
86 java.util.ListResourceBundle \ |
91 java.util.ListResourceBundle \ |
87 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ |
92 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \ |
88 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ |
93 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \ |
89 java.util.ListResourceBundle \ |
94 java.util.ListResourceBundle \ |
90 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ |
95 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ |
91 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ |
96 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ |
92 java.util.ListResourceBundle |
97 java.util.ListResourceBundle |
93 $(ECHO) PROPS_ARE_CREATED=yes > $@ |
98 $(ECHO) PROPS_ARE_CREATED = yes > $@ |
94 |
99 |
95 # Trigger the generation of the resource bundles. After the resource bundles have |
100 # Trigger the generation of the resource bundles. After the resource bundles have |
96 # been compiled, then the makefile will restart and the newly created java files |
101 # been compiled, then the makefile will restart and the newly created java files |
97 # will become part of the build further along in the makefile. |
102 # will become part of the build further along in the makefile. |
98 -include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
103 -include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
99 |
104 |
100 ifeq ($(PROPS_ARE_CREATED),yes) |
105 ifeq ($(PROPS_ARE_CREATED), yes) |
101 # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac |
106 # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac |
102 # that can be compiled with an old javac. The intermediate javac is then used |
107 # that can be compiled with an old javac. The intermediate javac is then used |
103 # to compile javac again and to build the complete new jdk. |
108 # to compile javac again and to build the complete new jdk. |
104 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS,\ |
109 $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \ |
105 SETUP:=BOOT_JAVAC,\ |
110 SETUP := BOOT_JAVAC, \ |
106 DISABLE_SJAVAC:=true,\ |
111 DISABLE_SJAVAC := true, \ |
107 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
112 SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ |
108 EXCLUDES:=com/sun/tools/javac/nio,\ |
113 EXCLUDES := com/sun/tools/javac/nio, \ |
109 COPY:=$(RESOURCE_SUFFIXES),\ |
114 COPY := $(RESOURCE_SUFFIXES), \ |
110 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) |
115 BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) |
111 |
116 |
112 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
117 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \ |
113 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
118 SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \ |
114 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ |
119 JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \ |
115 SUFFIXES:=.class $(RESOURCE_SUFFIXES))) |
120 SUFFIXES := .class $(RESOURCE_SUFFIXES))) |
116 |
121 |
117 # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not |
122 # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not |
118 # yet built. It is currently not needed but might be again in the future. The following |
123 # yet built. It is currently not needed but might be again in the future. The following |
119 # exercises the functionality to verify that it works. |
124 # exercises the functionality to verify that it works. |
120 TOOL_GENSTUBS_CMD=$(JAVA) \ |
125 TOOL_GENSTUBS_CMD = $(JAVA) \ |
121 "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
126 "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
122 -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ |
127 -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \ |
123 genstubs.GenStubs |
128 genstubs.GenStubs |
124 # We fetch source from the JDK... |
129 |
125 JDKS=$(JDK_TOPDIR)/src/share/classes |
130 # We fetch source from the JDK... |
126 # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't |
131 JDKS = $(JDK_TOPDIR)/src/share/classes |
127 # currently needed, but is used as a demo for now. |
132 |
128 STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ |
133 # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't |
129 -e "$(JDKS)/java/util/function/Predicate.java") |
134 # currently needed, but is used as a demo for now. |
130 # Rewrite the file names into class names because the GenStubs tool require this. |
135 |
131 STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES))) |
136 STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ |
132 |
137 -e "$(JDKS)/java/util/function/Predicate.java") |
133 # Now setup the build recipe for genstubs. |
138 |
134 $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \ |
139 # Rewrite the file names into class names because the GenStubs tool require this. |
135 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
140 STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES))) |
136 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
141 |
137 $(MKDIR) -p $(@D) |
142 # Now setup the build recipe for genstubs. |
138 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs |
143 $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \ |
139 $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. |
144 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
140 ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED=yes > $@) |
145 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d |
141 if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ |
146 $(MKDIR) -p $(@D) |
142 $(ECHO) $(LOG_INFO) No changes in the stubs!; \ |
147 $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs |
143 $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ |
148 $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. |
144 else \ |
149 ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@) |
145 $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ |
150 if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ |
146 $(RM) -r $(@D); \ |
151 $(ECHO) $(LOG_INFO) No changes in the stubs!; \ |
147 $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ |
152 $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ |
148 fi |
153 else \ |
149 $(ECHO) STUBS_ARE_CREATED=yes > $@ |
154 $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ |
150 |
155 $(RM) -r $(@D); \ |
151 # Trigger a generation of the genstubs java source code and a restart |
156 $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ |
152 # of the makefile to make sure that the following build setup use the |
157 fi |
153 # newly created java files. |
158 $(ECHO) STUBS_ARE_CREATED = yes > $@ |
154 -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d |
159 |
155 |
160 # Trigger a generation of the genstubs java source code and a restart |
156 ifeq ($(STUBS_ARE_CREATED),yes) |
161 # of the makefile to make sure that the following build setup use the |
157 # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar |
162 # newly created java files. |
158 # that generates code for the new jdk that is being built. |
163 -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d |
159 # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. |
164 |
160 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ |
165 ifeq ($(STUBS_ARE_CREATED), yes) |
161 JVM:=$(JAVA),\ |
166 # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar |
162 JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
167 # that generates code for the new jdk that is being built. |
163 -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
168 # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. |
164 com.sun.tools.javac.Main,\ |
169 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \ |
165 FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ |
170 JVM := $(JAVA), \ |
166 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
171 JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
167 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
172 -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
168 |
173 com.sun.tools.javac.Main, \ |
169 $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ |
174 FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \ |
170 SETUP:=GENERATE_NEWBYTECODE,\ |
175 SERVER_DIR := $(SJAVAC_SERVER_DIR), \ |
171 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ |
176 SERVER_JVM := $(SJAVAC_SERVER_JAVA))) |
172 $(LANGTOOLS_OUTPUTDIR)/genstubs,\ |
177 |
173 EXCLUDES:=java/util java/io java/nio,\ |
178 $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \ |
174 COPY:=$(RESOURCE_SUFFIXES),\ |
179 SETUP := GENERATE_NEWBYTECODE, \ |
175 BIN:=$(LANGTOOLS_OUTPUTDIR)/classes)) |
180 SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ |
176 |
181 $(LANGTOOLS_OUTPUTDIR)/genstubs, \ |
177 $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC,$(BUILD_FULL_JAVAC),\ |
182 EXCLUDES := java/util java/io java/nio, \ |
178 SETUP:=GENERATE_NEWBYTECODE,\ |
183 COPY := $(RESOURCE_SUFFIXES), \ |
179 SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\ |
184 BIN := $(LANGTOOLS_OUTPUTDIR)/classes)) |
180 SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ |
185 |
181 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) |
186 $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \ |
182 |
187 SETUP := GENERATE_NEWBYTECODE, \ |
183 $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\ |
188 SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \ |
184 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
189 SUFFIXES := .class $(RESOURCE_SUFFIXES), \ |
185 ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) |
190 JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar)) |
186 |
191 |
187 all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ |
192 $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \ |
188 $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ |
193 SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \ |
189 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
194 ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) |
190 |
195 |
191 endif |
196 all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ |
|
197 $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ |
|
198 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
|
199 |
|
200 endif |
192 endif |
201 endif |