36 |
36 |
37 ################################################################################ |
37 ################################################################################ |
38 |
38 |
39 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \ |
39 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \ |
40 SETUP := GENERATE_OLDBYTECODE, \ |
40 SETUP := GENERATE_OLDBYTECODE, \ |
41 ADD_JAVAC_FLAGS := "-Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes$(PATH_SEP)$(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes", \ |
41 ADD_JAVAC_FLAGS := -Xbootclasspath/p:$(call PathList, \ |
|
42 $(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \ |
|
43 $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes), \ |
42 SRC := $(JDK_TOPDIR)/make/src/classes $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes, \ |
44 SRC := $(JDK_TOPDIR)/make/src/classes $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes, \ |
43 BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \ |
45 BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \ |
44 COPY := boot.modules ext.modules)) |
46 COPY := boot.modules ext.modules)) |
45 |
47 |
46 $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \ |
48 $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \ |
124 |
126 |
125 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
127 TOOL_CLDRCONVERTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \ |
126 build.tools.cldrconverter.CLDRConverter |
128 build.tools.cldrconverter.CLDRConverter |
127 |
129 |
128 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \ |
130 TOOL_GENMODULESXML = $(JAVA_SMALL) -Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR) \ |
129 -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \ |
131 -cp $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes $(JDK_OUTPUTDIR)) \ |
130 build.tools.module.GenJdepsModulesXml |
132 build.tools.module.GenJdepsModulesXml |
131 |
133 |
132 TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \ |
134 TOOL_IMAGEBUILDER = $(JAVA_SMALL) -Xbootclasspath/p:$(BUILDTOOLS_OUTPUTDIR)/interim_jimage_classes \ |
133 -cp "$(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes$(PATH_SEP)$(JDK_OUTPUTDIR)" \ |
135 -cp $(call PathList, $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes $(JDK_OUTPUTDIR)) \ |
134 build.tools.module.ImageBuilder |
136 build.tools.module.ImageBuilder |
135 |
137 |
136 ########################################################################################## |
138 ########################################################################################## |
137 |
139 |
138 JIMAGE_PKGS := \ |
140 JIMAGE_PKGS := \ |