diff --git a/langtools/make/CompileInterim.gmk b/langtools/make/CompileInterim.gmk index c957a904978..a0e1e144ef1 100644 --- a/langtools/make/CompileInterim.gmk +++ b/langtools/make/CompileInterim.gmk @@ -41,11 +41,11 @@ $(eval $(call SetupJavaCompilation,BUILD_INTERIM_LANGTOOLS, \ DISABLE_SJAVAC := true, \ SRC := $(LANGTOOLS_TOPDIR)/src/java.compiler/share/classes \ $(LANGTOOLS_TOPDIR)/src/jdk.compiler/share/classes \ - $(LANGTOOLS_TOPDIR)/src/jdk.dev/share/classes \ $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes \ + $(LANGTOOLS_TOPDIR)/src/jdk.jdeps/share/classes \ $(SUPPORT_OUTPUTDIR)/gensrc/jdk.compiler \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.dev \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc, \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdeps, \ EXCLUDES := sun jdk, \ COPY := .gif .xml .css .js javax.tools.JavaCompilerTool, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_interim_classes, \ diff --git a/langtools/make/build.properties b/langtools/make/build.properties index dd902e0ad9e..9bb5f5095d4 100644 --- a/langtools/make/build.properties +++ b/langtools/make/build.properties @@ -47,11 +47,11 @@ boot.javac.source = 8 boot.javac.target = 8 #configuration of submodules (share by both the bootstrap and normal compilation): -langtools.modules=java.compiler:jdk.compiler:jdk.dev:jdk.javadoc +langtools.modules=java.compiler:jdk.compiler:jdk.jdeps:jdk.javadoc java.compiler.dependencies= jdk.compiler.dependencies=java.compiler jdk.javadoc.dependencies=java.compiler:jdk.compiler -jdk.dev.dependencies=java.compiler:jdk.compiler +jdk.jdeps.dependencies=java.compiler:jdk.compiler javac.resource.includes = \ com/sun/tools/javac/resources/compiler.properties diff --git a/langtools/make/build.xml b/langtools/make/build.xml index e88cf9e76c4..1876100101c 100644 --- a/langtools/make/build.xml +++ b/langtools/make/build.xml @@ -257,7 +257,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -527,7 +527,7 @@ resource.includes="${javac.resource.includes}" /> - diff --git a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk index 0caef1da1ae..2f8f8633ffd 100644 --- a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk +++ b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk @@ -31,11 +31,8 @@ $(eval $(call SetupVersionProperties,JAVAC_VERSION, \ $(eval $(call SetupVersionProperties,JAVAH_VERSION, \ com/sun/tools/javah/resources/version.properties)) -$(eval $(call SetupVersionProperties,JAVAP_VERSION, \ - com/sun/tools/javap/resources/version.properties)) - $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \ - $(JAVAC_VERSION) $(JAVAH_VERSION) $(JAVAP_VERSION))) + $(JAVAC_VERSION) $(JAVAH_VERSION))) $(eval $(call SetupParseProperties,PARSE_PROPERTIES, \ com/sun/tools/javac/resources/compiler.properties)) diff --git a/langtools/make/gensrc/Gensrc-jdk.dev.gmk b/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk similarity index 86% rename from langtools/make/gensrc/Gensrc-jdk.dev.gmk rename to langtools/make/gensrc/Gensrc-jdk.jdeps.gmk index bf35d05b0d0..91095437aff 100644 --- a/langtools/make/gensrc/Gensrc-jdk.dev.gmk +++ b/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk @@ -25,9 +25,13 @@ include GensrcCommon.gmk +$(eval $(call SetupVersionProperties,JAVAP_VERSION, \ + com/sun/tools/javap/resources/version.properties)) + $(eval $(call SetupVersionProperties,JDEPS_VERSION,\ com/sun/tools/jdeps/resources/version.properties)) -$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, $(JDEPS_VERSION))) +$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES,\ + $(JDEPS_VERSION) $(JAVAP_VERSION))) all: $(COMPILE_PROPERTIES) diff --git a/langtools/make/intellij/langtools.iml b/langtools/make/intellij/langtools.iml index 9619571d758..319eb7e188a 100644 --- a/langtools/make/intellij/langtools.iml +++ b/langtools/make/intellij/langtools.iml @@ -6,13 +6,13 @@ - + - + diff --git a/langtools/make/intellij/workspace.xml b/langtools/make/intellij/workspace.xml index 135f05a0fd3..8f453eabb05 100644 --- a/langtools/make/intellij/workspace.xml +++ b/langtools/make/intellij/workspace.xml @@ -10,7 +10,7 @@