110 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) |
110 BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) |
111 |
111 |
112 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
112 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
113 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
113 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
114 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ |
114 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ |
115 JARMAIN:=com.sun.tools.javac.Main)) |
115 SUFFIXES:=.class $(RESOURCE_SUFFIXES))) |
116 |
|
117 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAH,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
|
118 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
|
119 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar,\ |
|
120 JARMAIN:=com.sun.tools.javah.Main)) |
|
121 |
|
122 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAP,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
|
123 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
|
124 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar,\ |
|
125 JARMAIN:=com.sun.tools.javap.Main)) |
|
126 |
|
127 $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\ |
|
128 SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\ |
|
129 JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\ |
|
130 SUFFIXES:=.class $(RESOURCE_SUFFIXES),\ |
|
131 JARMAIN:=com.sun.tools.javadoc.Main)) |
|
132 |
116 |
133 # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not |
117 # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not |
134 # yet built. It is currently not needed but might be again in the future. The following |
118 # yet built. It is currently not needed but might be again in the future. The following |
135 # exercises the functionality to verify that it works. |
119 # exercises the functionality to verify that it works. |
136 TOOL_GENSTUBS_CMD=$(JAVA) \ |
120 TOOL_GENSTUBS_CMD=$(JAVA) \ |
174 # that generates code for the new jdk that is being built. |
158 # that generates code for the new jdk that is being built. |
175 # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. |
159 # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm. |
176 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ |
160 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE,\ |
177 JVM:=$(JAVA),\ |
161 JVM:=$(JAVA),\ |
178 JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
162 JAVAC:="-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \ |
179 -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar,\ |
163 -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
|
164 com.sun.tools.javac.Main,\ |
180 FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ |
165 FLAGS:=-XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror,\ |
181 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
166 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ |
182 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
167 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) |
183 |
168 |
184 $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ |
169 $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\ |
199 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
184 SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ |
200 ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) |
185 ZIP:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip)) |
201 |
186 |
202 all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ |
187 all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \ |
203 $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ |
188 $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \ |
204 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ |
189 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar |
205 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javah.jar \ |
|
206 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javap.jar \ |
|
207 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar |
|
208 |
|
209 |
190 |
210 endif |
191 endif |
211 endif |
192 endif |