# HG changeset patch # User mchung # Date 1432758318 25200 # Node ID 2b3f379840f0789e6cd844fc3923814cea7dc439 # Parent 43ddd58a5a5632f29fc5e35e2cd5e7d749de490e 8074432: Move jdeps and javap to jdk.jdeps module Reviewed-by: jjg, alanb, erikj diff -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/CompileInterim.gmk --- a/langtools/make/CompileInterim.gmk Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/CompileInterim.gmk Wed May 27 13:25:18 2015 -0700 @@ -41,11 +41,11 @@ 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 -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/build.properties --- a/langtools/make/build.properties Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/build.properties Wed May 27 13:25:18 2015 -0700 @@ -47,11 +47,11 @@ 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 -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/build.xml --- a/langtools/make/build.xml Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/build.xml Wed May 27 13:25:18 2015 -0700 @@ -257,7 +257,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -527,7 +527,7 @@ resource.includes="${javac.resource.includes}" /> - diff -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/gensrc/Gensrc-jdk.compiler.gmk --- a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk Wed May 27 13:25:18 2015 -0700 @@ -31,11 +31,8 @@ $(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 -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/gensrc/Gensrc-jdk.dev.gmk --- a/langtools/make/gensrc/Gensrc-jdk.dev.gmk Wed May 27 11:27:42 2015 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -# -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# - -include GensrcCommon.gmk - -$(eval $(call SetupVersionProperties,JDEPS_VERSION,\ - com/sun/tools/jdeps/resources/version.properties)) - -$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, $(JDEPS_VERSION))) - -all: $(COMPILE_PROPERTIES) diff -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/gensrc/Gensrc-jdk.jdeps.gmk --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk Wed May 27 13:25:18 2015 -0700 @@ -0,0 +1,37 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. Oracle designates this +# particular file as subject to the "Classpath" exception as provided +# by Oracle in the LICENSE file that accompanied this code. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +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) $(JAVAP_VERSION))) + +all: $(COMPILE_PROPERTIES) diff -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/intellij/langtools.iml --- a/langtools/make/intellij/langtools.iml Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/intellij/langtools.iml Wed May 27 13:25:18 2015 -0700 @@ -6,13 +6,13 @@ - + - + diff -r 43ddd58a5a56 -r 2b3f379840f0 langtools/make/intellij/workspace.xml --- a/langtools/make/intellij/workspace.xml Wed May 27 11:27:42 2015 +0530 +++ b/langtools/make/intellij/workspace.xml Wed May 27 13:25:18 2015 -0700 @@ -10,7 +10,7 @@